Question

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?

Answer 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.