我知道Mercurial for Beginners: The Definitive Practical Guide和答案一样Mercurial merge branches? (abort: push creates new remote branches)如何撤消“中止:推分支创建新的远程头”在善变
在这里,我无意间创造了哪里水银想创建一个新的远程头的情况。解决这个问题的最好方法是什么,并且在远程方面对这个错误留下很少或没有任何痕迹?
###> 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
如果我合并,它的排序似乎OK:
hg merge
abort: outstanding uncommitted merges
但hg diff
显示各种变化我没有做的。我愿意重新应用我的更改......我如何将这一切都带回单一提示,放弃所有本地更改?
hg输出输出是什么? – Tom 2013-04-05 22:46:29