我知道Mercurial for Beginners: The Definitive Practical Guide和Mercurial 合并分支之类的答案?(中止:推送创建新的远程分支)
在这里,我无意中创建了 Mercurial 想要创建一个新的远程头的情况。撤消此问题的最佳方法是什么,并且在远程端留下很少或根本没有此错误的痕迹?
###> hg push
pushing to http://example.com
searching for changes
abort: push creates new remote heads on branch 'default'!
(did you forget to merge? use push -f to force)
###> hg revert --all -r tip
###> hg update -C
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
###> hg incoming
comparing with http://example.com
searching for changes
no changes found
###> hg summary
parent: 488:e3db024fe901 tip
Misc.
branch: default
commit: (clean)
update: 6 new changesets, 2 branch heads (merge)
###> hg pull
pulling from http://example.com
searching for changes
no changes found
###> hg glog
@ changeset: 488:e3db024fe901
| tag: tip
| summary: Misc.
|
o changeset: 487:b207579b9d41
| parent: 480:ce775708800c
| summary: Misc.
|
| o changeset: 486:59a7a5b34c7f
| | user: other
| | summary: fixes
| |
| o changeset: 485:b28264333e18
| | user: other
| | summary: binary
如果我合并,它看起来不错:
hg merge
abort: outstanding uncommitted merges
但hg diff
显示了我没有做的各种改变。我愿意重新应用我的更改...我怎样才能将这一切恢复到一个提示,放弃所有本地更改?