hg搁置似乎没有效果? [英] hg unshelve seems to have no effect?
问题描述
我们的团队刚刚开始使用Mercurial.我们开始玩的第一件事是hg shelve
.在本地,我没有任何搁置更改的问题.据我所知,这一切都非常完美.但是,当我尝试取消搁置时,会收到restoring backup files
消息,但是当我运行hg diff
时,没有任何更改,并且代码中缺少我的更改.如果我做了hg unshelve -i
,我可以看到差异,但是再次尝试取消搁置似乎没有任何效果.
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.
我一直在尝试通过一些非常简单的更改对其进行测试,这些更改在冲突方面应该不是问题,例如添加测试注释.我应该注意,我已经尝试过hg unshelve -f
,其后会显示unshelve completed
,但是同样,我的更改不会恢复.
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?
如果有关系:Mercurial Distributed SCM(版本1.5.1 + 20100405)
If it matters: Mercurial Distributed SCM (version 1.5.1+20100405)
推荐答案
尝试使用fork并成功运行: https: //bitbucket.org/astiob/hgshelve/
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.
这篇关于hg搁置似乎没有效果?的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!