开发者

Reverting a merge in Mercurial

开发者 https://www.devze.com 2023-01-17 06:04 出处:网络
I did a merge, but then I stuffed it up, so I decided to revert back. I have tried to revert to one of the revisions I merged several times, but this doesn\'t work. It doesn\'t t开发者_JAVA百科hrow an

I did a merge, but then I stuffed it up, so I decided to revert back. I have tried to revert to one of the revisions I merged several times, but this doesn't work. It doesn't t开发者_JAVA百科hrow any errors, it is just that my current repository state is still shown as having two heads. I also tried deleting all of the backup files that reversion automatically creates. How can I restore my repository to a clean state on one of the heads?


Try hg update -C to one of the heads, or any revision.

To avoid the situation, instead of reverting you can just commit the unwanted merge, then strip it later.

0

精彩评论

暂无评论...
验证码 换一张
取 消