Bug 3177 - [git] Multiple changes to the same file break git support
Summary: [git] Multiple changes to the same file break git support
Status: RESOLVED FIXED
Alias: None
Product: Xamarin Studio
Classification: Desktop
Component: Version Control ()
Version: Trunk
Hardware: PC Mac OS
: --- normal
Target Milestone: ---
Assignee: Alan McGovern
URL:
Depends on:
Blocks:
 
Reported: 2012-02-01 10:16 UTC by Alan McGovern
Modified: 2012-02-05 09:29 UTC (History)
1 user (show)

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

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 on Developer Community or GitHub with your current version information, steps to reproduce, and relevant error messages or log files if you are hitting an issue that looks similar to this resolved bug and you do not yet see a matching new report.

Related Links:
Status:
RESOLVED FIXED

Description Alan McGovern 2012-02-01 10:16:40 UTC
Note: A new ngit may resolve this

1) Add a new directory a project under Git version control. This automatically modifies the csproj to add the reference to the new directory.
2) Add a new file to the project. This modifies the csproj again to add the reference to the new file
3) Open the version control status window
4) Select the new file and the csproj and click on 'Revert'

Result:

Version control operation failed: Duplicate stages not allowed: 0 GitSample.csproj. Duplicate stages not allowed: 0 GitSample.csproj


System.InvalidOperationException: Duplicate stages not allowed: 0 GitSample.csproj
  at NGit.Dircache.DirCacheBuilder.Resort () [0x00000] in <filename unknown>:0 
  at NGit.Dircache.DirCacheBuilder.Finish () [0x00000] in <filename unknown>:0 
  at NGit.Dircache.BaseDirCacheEditor.Commit () [0x00000] in <filename unknown>:0 
  at MonoDevelop.VersionControl.Git.GitRepository.Revert (MonoDevelop.Core.FilePath[] localPaths, Boolean recurse, IProgressMonitor monitor) [0x00265] in /Users/alanmcgovern/Projects/monodevelop/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git/GitRepository.cs:715
Comment 1 Alan McGovern 2012-02-05 09:29:13 UTC
New ngit fixed this bug.