diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2011-11-02 10:03:16 +0400 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2011-11-02 10:03:16 +0400 |
commit | f8e9e1d90d2fb0a859c5682636ee4a8a4e20271b (patch) | |
tree | 5beda2a492ea7e26083947f2309eb5302a85491b /main/src/addins/VersionControl | |
parent | fc54ca49eda7af3e9c119256a3b583d03816e103 (diff) | |
parent | b639f9d5574d8b4e6fadfd9012e111165af39643 (diff) |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/HighlightUsagesExtension.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/TextEditorResolverProvider.cs
main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs
main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
Diffstat (limited to 'main/src/addins/VersionControl')
6 files changed, 22 insertions, 19 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml index 07a656579b..0f956b4a76 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml @@ -6,16 +6,16 @@ url = "http://www.monodevelop.com/" description = "Git support for the Version Control Add-in" category = "Version Control" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import assembly="MonoDevelop.VersionControl.Git.dll"/> </Runtime> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="VersionControl" version="2.8.1"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="Ide" version="2.8.2"/> + <Addin id="VersionControl" version="2.8.2"/> </Dependencies> <Extension path="/MonoDevelop/VersionControl/VersionControlSystems"> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml index 717c6c3c1c..89733b4fc4 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml @@ -6,13 +6,13 @@ url = "http://taubz.for.net/code/diff"
description = "Subversion support for Linux and MacOSX"
category = "Version Control"
- version = "2.8.1">
+ version = "2.8.2">
<Dependencies>
- <Addin id="Core" version="2.8.1"/>
- <Addin id="Ide" version="2.8.1"/>
- <Addin id="VersionControl" version="2.8.1"/>
- <Addin id="VersionControl.Subversion" version="2.8.1"/>
+ <Addin id="Core" version="2.8.2"/>
+ <Addin id="Ide" version="2.8.2"/>
+ <Addin id="VersionControl" version="2.8.2"/>
+ <Addin id="VersionControl.Subversion" version="2.8.2"/>
</Dependencies> <Extension path = "/MonoDevelop/VersionControl/VersionControlSystems">
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml index 9b3837be01..1c9c1694dd 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml @@ -7,12 +7,12 @@ description = "Subversion core engine"
category = "Version Control"
flags = "Hidden"
- version = "2.8.1">
+ version = "2.8.2">
<Dependencies>
- <Addin id="Core" version="2.8.1"/>
- <Addin id="Ide" version="2.8.1"/>
- <Addin id="VersionControl" version="2.8.1"/>
+ <Addin id="Core" version="2.8.2"/>
+ <Addin id="Ide" version="2.8.2"/>
+ <Addin id="VersionControl" version="2.8.2"/>
</Dependencies> <Extension path = "/MonoDevelop/Ide/Commands/VersionControl"> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs index 8062dac616..0e4cfe6b4a 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs @@ -230,6 +230,8 @@ namespace MonoDevelop.VersionControl.Subversion {
foreach (FilePath path in paths) {
if (IsVersioned (path) && File.Exists (path) && !Directory.Exists (path)) {
+ if (rootPath == null)
+ throw new UserException (GettextCatalog.GetString ("Project publishing failed. There is a stale .svn folder in the path '{0}'", path.ParentDirectory));
VersionInfo srcInfo = GetVersionInfo (path, false);
if (srcInfo.HasLocalChange (VersionStatus.ScheduledDelete)) {
// It is a file that was deleted. It can be restored now since it's going
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs index 9ab8a99e25..4cb9dc10c1 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs @@ -43,7 +43,7 @@ namespace MonoDevelop.VersionControl.Views { protected override TextEditor MainEditor { get { - return editors[1]; + return editors != null && editors.Length >= 2 ? editors[1] : null; } } @@ -95,7 +95,8 @@ namespace MonoDevelop.VersionControl.Views protected override void OnDestroyed () { base.OnDestroyed (); - MainEditor.Document.TextReplaced -= UpdateConflictsOnTextReplace; + if (MainEditor != null && MainEditor.Document != null) + MainEditor.Document.TextReplaced -= UpdateConflictsOnTextReplace; } public string GetResultText () diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml index 1b738f85b8..a3af3e3ed0 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml @@ -7,7 +7,7 @@ description = "A MonoDevelop addin for using version control systems like Subversion" category = "Version Control" flags = "Hidden" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import file="comment.png" /> @@ -24,9 +24,9 @@ </Runtime> <Dependencies> - <Addin id="Core" version="2.8.1"/> - <Addin id="Ide" version="2.8.1"/> - <Addin id="SourceEditor2" version="2.8.1"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="Ide" version="2.8.2"/> + <Addin id="SourceEditor2" version="2.8.2"/> </Dependencies> <ExtensionPoint path = "/MonoDevelop/VersionControl/VersionControlSystems" name = "Version control systems"> |