Bug 13807 - Update overwrites changes
Summary: Update overwrites changes
Alias: None
Product: Xamarin Studio
Classification: Desktop
Component: Version Control ()
Version: unspecified
Hardware: PC Windows
: Normal normal
Target Milestone: master
Assignee: Marius Ungureanu
Depends on:
Reported: 2013-08-07 06:28 UTC by Marius Ungureanu
Modified: 2015-08-20 03:23 UTC (History)
2 users (show)

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:

Description Marius Ungureanu 2013-08-07 06:28:28 UTC

Solution: Dialog when you don't have stash/unstash to ask what to do.
Comment 1 Marius Ungureanu 2013-08-12 07:57:02 UTC
Apparently, the bug was due to a stash failing on saving or on popping. I do not know what is the root cause of this.

I could only reproduce it before with directories being skipped on update. Will investigate if Ignore has any effect on this.
Comment 2 Marius Ungureanu 2013-08-21 06:32:59 UTC
I could not manage to reproduce it as of now. I need more information on why this happened.
Comment 3 Marius Ungureanu 2013-11-26 11:53:31 UTC
And the report info is something that cannot help me reproduce. I've not had issues with stashing/unstashing except if submodules were out of sync, but that is fixed now.
Comment 4 Marius Ungureanu 2014-07-03 12:56:41 UTC
Fixed in libgit2sharp switch.
Comment 5 Abhishek 2015-05-01 08:41:27 UTC
I have tried to verify this issue at my end.

1. Checkout an already published repository 
2. Make some changes to the project.
3.Go to Version Control menu->Stash.
4. It will stash the file .Go to Manage stash and unstash it.

Here is the Screencast for the Same: http://www.screencast.com/t/bQgZFrD5cY9

But I am not sure whether I am following correct step to verify this issue? Please confirm.

Comment 6 Marius Ungureanu 2015-05-05 15:05:29 UTC
I wasn't able to reproduce this myself, but this was something like:

1. Checkout a repository.
2. Modify some/many files in the project.
3. Modify some/many files on github.
4. Do update.
5. See that none of the changes you made were lost
6. if you see lines with <<<<< or ===== or >>>>, that's a merge conflict and it's fine.
Comment 7 Abhishek 2015-05-06 08:02:59 UTC
Thanks @Marius,

I have checked this issue with XamarinStudio- this issue is
working fine.Here is the screencast for the same:

Hence closing this issue.