Bug 27762 - [SVN] When we try resolve the conflict by merge, the XS throws MonoDevelop.VersionControl.Subversion.SubversionException: Commit failed
Summary: [SVN] When we try resolve the conflict by merge, the XS throws MonoDevelop.Ve...
Status: NEW
Alias: None
Product: Xamarin Studio
Classification: Desktop
Component: Version Control (show other bugs)
Version: 5.7
Hardware: PC Mac OS
: --- normal
Target Milestone: master
Assignee: Marius Ungureanu
URL:
Depends on:
Blocks:
 
Reported: 2015-03-09 03:55 UTC by Prashant Cholachagudda
Modified: 2015-03-11 01:13 UTC (History)
3 users (show)

Tags:
Is this bug a regression?: ---
Last known good build:


Attachments
Steps to reproduce (488.17 KB, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet)
2015-03-09 03:55 UTC, Prashant Cholachagudda
Details


Notice (2018-05-24): bugzilla.xamarin.com is now in read-only mode.

Please join us on Visual Studio Developer Community and in the Xamarin and Mono organizations on GitHub to continue tracking issues. Bugzilla will remain available for reference in read-only mode. We will continue to work on open Bugzilla bugs, copy them to the new locations as needed for follow-up, and add the new items under Related Links.

Our sincere thanks to everyone who has contributed on this bug tracker over the years. Thanks also for your understanding as we make these adjustments and improvements for the future.


Please create a new report for Bug 27762 on Developer Community or GitHub if you have new information to add and do not yet see a matching new report.

If the latest results still closely match this report, you can use the original description:

  • Export the original title and description: Developer Community HTML or GitHub Markdown
  • Copy the title and description into the new report. Adjust them to be up-to-date if needed.
  • Add your new information.

In special cases on GitHub you might also want the comments: GitHub Markdown with public comments

Related Links:
Status:
NEW

Description Prashant Cholachagudda 2015-03-09 03:55:03 UTC
Created attachment 10208 [details]
Steps to reproduce

When we try resolve the conflict by merge, the XS throws MonoDevelop.VersionControl.Subversion.SubversionException: Commit failed

Stacktrace:
ERROR [2015-02-24 18:46:30Z]: MonoDevelop.VersionControl.Subversion.SubversionException: Commit failed (details follow):
File '/ConsoleApplication1/Program.cs' is out of date
  at MonoDevelop.VersionControl.Subversion.Unix.SvnClient.CheckError (IntPtr error, Nullable`1 allowedError) [0x00011] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs:74 
  at MonoDevelop.VersionControl.Subversion.Unix.SvnClient.CheckError (IntPtr error) [0x00000] in <filename unknown>:0 
  at MonoDevelop.VersionControl.Subversion.Unix.UnixSvnBackend.CheckError (IntPtr error) [0x00000] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs:218 
  at MonoDevelop.VersionControl.Subversion.Unix.UnixSvnBackend.Commit (MonoDevelop.Core.FilePath[] paths, System.String message, IProgressMonitor monitor) [0x0005c] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs:825 
  at MonoDevelop.VersionControl.Subversion.SubversionRepository.OnCommit (MonoDevelop.VersionControl.ChangeSet changeSet, IProgressMonitor monitor) [0x0003b] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:201 
  at MonoDevelop.VersionControl.Repository.Commit (MonoDevelop.VersionControl.ChangeSet changeSet, IProgressMonitor monitor) [0x00022] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs:495 
  at MonoDevelop.VersionControl.CommitCommand+CommitWorker.Run () [0x0003c] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs:62 
ERROR [2015-02-24 18:46:30Z]: バージョン管理操作が失敗しました:. Commit failed (details follow):
File '/ConsoleApplication1/Program.cs' is out of date
MonoDevelop.VersionControl.Subversion.SubversionException: Commit failed (details follow):
File '/ConsoleApplication1/Program.cs' is out of date
  at MonoDevelop.VersionControl.Subversion.Unix.SvnClient.CheckError (IntPtr error, Nullable`1 allowedError) [0x00011] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs:74 
  at MonoDevelop.VersionControl.Subversion.Unix.SvnClient.CheckError (IntPtr error) [0x00000] in <filename unknown>:0 
  at MonoDevelop.VersionControl.Subversion.Unix.UnixSvnBackend.CheckError (IntPtr error) [0x00000] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs:218 
  at MonoDevelop.VersionControl.Subversion.Unix.UnixSvnBackend.Commit (MonoDevelop.Core.FilePath[] paths, System.String message, IProgressMonitor monitor) [0x0005c] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/SvnClient.cs:825 
  at MonoDevelop.VersionControl.Subversion.SubversionRepository.OnCommit (MonoDevelop.VersionControl.ChangeSet changeSet, IProgressMonitor monitor) [0x0003b] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs:201 
  at MonoDevelop.VersionControl.Repository.Commit (MonoDevelop.VersionControl.ChangeSet changeSet, IProgressMonitor monitor) [0x00022] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/Repository.cs:495 
  at MonoDevelop.VersionControl.CommitCommand+CommitWorker.Run () [0x0003c] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/CommitCommand.cs:62 
ERROR [2015-02-24 18:46:51Z]: An unhandled exception has occured. Terminating MonoDevelop? True
System.ArgumentException: offset + count is beyond EOF
  at Mono.TextEditor.TextDocument.GetTextAt (Int32 offset, Int32 count) [0x00068] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/TextDocument.cs:301 
  at Mono.TextEditor.TextDocument.Replace (Int32 offset, Int32 count, System.String value, AnchorMovementType anchorMovementType) [0x0007d] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/TextDocument.cs:243 
  at Mono.TextEditor.TextDocument.Replace (Int32 offset, Int32 count, System.String value) [0x00006] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/TextDocument.cs:229 
  at Mono.TextEditor.TextEditorData.Replace (Int32 offset, Int32 count, System.String value) [0x0000a] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs:490 
  at Mono.TextEditor.TextEditorData.Remove (Int32 offset, Int32 count) [0x00005] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs:431 
  at Mono.TextEditor.TextArea.Remove (Int32 offset, Int32 count) [0x00001] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs:1974 
  at Mono.TextEditor.TextEditor.Remove (Int32 offset, Int32 count) [0x00001] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextEditor.cs:761 
  at MonoDevelop.SourceEditor.SourceEditorView.DeleteText (Int32 position, Int32 length) [0x00007] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:1687 
  at MonoDevelop.VersionControl.Views.EditorCompareWidgetBase.HandleDataDocumentTextReplaced (System.Object sender, Mono.TextEditor.DocumentChangeEventArgs e) [0x0003e] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs:628 
  at (wrapper delegate-invoke) System.EventHandler`1<Mono.TextEditor.DocumentChangeEventArgs>:invoke_void_object_TEventArgs (object,Mono.TextEditor.DocumentChangeEventArgs)
  at Mono.TextEditor.TextDocument.OnTextReplaced (Mono.TextEditor.DocumentChangeEventArgs args) [0x00014] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/TextDocument.cs:422 
  at Mono.TextEditor.TextDocument.Replace (Int32 offset, Int32 count, System.String value, AnchorMovementType anchorMovementType) [0x0013e] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/TextDocument.cs:263 
  at Mono.TextEditor.TextDocument.Replace (Int32 offset, Int32 count, System.String value) [0x00006] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/core/Mono.Texteditor/Mono.TextEditor/Document/TextDocument.cs:229 
  at Mono.TextEditor.TextEditorData.Replace (Int32 offset, Int32 count, System.String value) [0x0000a] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs:490 
  at Mono.TextEditor.TextArea.Replace (Int32 offset, Int32 count, System.String value) [0x0000a] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextArea.cs:1979 
  at Mono.TextEditor.TextEditor.Replace (Int32 offset, Int32 count, System.String value) [0x0000a] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/core/Mono.Texteditor/Mono.TextEditor/Gui/TextEditor.cs:766 
  at MonoDevelop.VersionControl.Views.EditorCompareWidgetBase.UndoChange (Mono.TextEditor.TextEditor fromEditor, Mono.TextEditor.TextEditor toEditor, Hunk hunk) [0x0010f] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs:657 
  at MonoDevelop.VersionControl.Views.MergeWidget.UndoChange (Mono.TextEditor.TextEditor fromEditor, Mono.TextEditor.TextEditor toEditor, Hunk hunk) [0x00005] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs:54 
  at MonoDevelop.VersionControl.Views.EditorCompareWidgetBase+MiddleArea.OnButtonPressEvent (Gdk.EventButton evnt) [0x00041] in /Users/builder/data/lanes/monodevelop-lion-monodevelop-5.7-branch/0bc7d355/source/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs:748 
  at Gtk.Widget.buttonpressevent_cb (IntPtr widget, IntPtr evnt) [0x00016] in /private/tmp/source-mono-mac-3.12.0-branch-32/bockbuild-mono-3.12.0-branch/profiles/mono-mac-xamarin/build-root/gtk-sharp-2.12.21/gtk/generated/Widget.cs:2938