'Forgetting' a dead-end branch

问题

I've got a mercurial repository. It was on rev A. I made some changes, committed (to rev B), and pushed. However, later, I realised I didn't want to make those changes. I updated back to rev A, and made some alternative changes, to rev C.

C
| -
| B
|/
A

However, now I can't push rev C, because it complains that it would create a new remote head (which it would). How do I make the remote mercurial simply forget about rev B and all the changes therein, so I can push rev C and carry on from there?

回答1:

Personally I'd close the branch and force the push (as Tim Henigan describes), as it leaves the DAG in a state which is truthful. There is another option though. Doing a dummy merge. This is a merge, but one where you ignore the incoming changes.

hg update C
hg -y merge --tool=internal:fail B
hg revert --all --rev .
hg resolve -a -m
hg ci

The end result is

M
|\
C |
| |
| B
|/
A

... but M doesn't contain any of B's changes.

回答2:

Editing History is hard. Once you push a changeset to a public repository, it can no longer be easily pruned from the history.

The most direct solution to your problem is:

hg update <tip of branch you want to forget>
hg commit --close-branch -m "close unwanted branch"
hg update <tip of branch you want to keep>
Push all your changes. As you noted, you will need to use --force since multiple heads on the branch now exist.

If you really need to prune the branch, then read EditingHistory again. If it still seems feasible, you can use one of the methods described in PruningDeadBranches.

回答3:

Use the backout command to reverse the B change.

hg up B
hg backout B

Now, you're working directory is in the same state it was before B, which I'll call A'.

After you backout, make your real change and commit. This is what your history will look like:

C
|
A' 
|
B
|
A

回答4:

Mercurial branches are permanent and registered in commit objects themselves. There are some (not too easy) methods for closing and/or removing branches, mainly listed here. I have even already used some of them before. Note that those are somewhat desperate solutions for people who did use branches thinking they can be temporary.

However, if you really want temporary branches, use bookmarks.

回答5:

Other people have some good answers for getting rid of 'B', but just to put it out there you can always do:

hg push --rev C

which will push C but not B and not complain about new heads.

来源：https://stackoverflow.com/questions/11015557/forgetting-a-dead-end-branch

标签

mercurial

branch