Our team is just getting started with Mercurial. One of the first things we've started to play with is hg shelve
. Locally, I have no problem shelving changes. It all works perfectly from what I can tell. However, when I try to unshelve, I get the restoring backup files
message, but when I run hg diff
, there are no changes, and my changes are missing from the code. If i do hg unshelve -i
I can see the diff, but again, trying to unshelve seems to have no effect.
I've been trying to test it with some very simple changes that shouldn't be a problem in terms of conflicts, e.g. adding a test comment. I should note that I've tried hg unshelve -f
after which it says unshelve completed
but again, my changes are not restored.
Any ideas what I am doing wrong?
If it matters: Mercurial Distributed SCM (version 1.5.1+20100405)
Tried that fork and it works: https://bitbucket.org/astiob/hgshelve/
So the answer seems to be, yes, it is broken, and yes, that fork fixes it.
As an update, I am currently on version Mercurial Distributed SCM (version 2.9.1)
and have no issues. If you are still experiencing problems with unshelve, I recommend updating to the newest Mercurial version.
来源:https://stackoverflow.com/questions/2784199/hg-unshelve-seems-to-have-no-effect