hg unshelve 好像没有效果?
我们的团队刚刚开始使用 Mercurial。我们首先开始使用的东西之一是 hg shelve
。在本地,我可以毫无问题地搁置更改。据我所知,一切都很完美。但是,当我尝试取消搁置时,我收到正在恢复备份文件
消息,但是当我运行hg diff
时,没有任何更改,并且代码中缺少我的更改。如果我执行 hg unshelve -i
我可以看到差异,但同样,尝试取消搁置似乎没有效果。
我一直在尝试用一些非常简单的更改来测试它,这些更改在冲突方面不应该成为问题,例如添加测试注释。我应该注意到,我已经尝试了 hg unshelve -f
,之后它显示 unshelvecompleted
但同样,我的更改没有恢复。
有什么想法我做错了吗?
如果重要的话:Mercurial Distributed SCM(版本 1.5.1+20100405)
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)
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(2)
尝试过那个叉子,它有效: 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.
作为更新,我目前使用的是
Mercurial Distributed SCM(版本 2.9.1)
版本,没有任何问题。如果您仍然遇到取消搁置问题,我建议您更新到最新的 Mercurial 版本。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.