rollback/backout a wrong merge between named branches?
Ringo De Smet
ringo.desmet at gmail.com
Thu Oct 8 14:57:36 UTC 2009
Colin,
2009/10/8 Colin Caughie <c.caughie at indigovision.com>:
>
> Didn't this happen recently on the hg development repository itself? How was it handled there?
>
I don't understand your questions!
Let me rephrase: the commits on the 'default' branch where not faulty.
These were valid commits for the ongoing development of our product
release 1.6. Now, someone performed a merge from a revision on branch
'default' to branch '1.5' which pulled a lot of changes to the 1.5
branch that is being stabilised. Then this merge changeset was pushed
to the central repository. We now have to undo this merge.
In all the documentation I checked so far, it seems that the Mercurial
command set doesn't give me a quick way of creating a *new* revision
with all the changes of this merge undone. Any suggestions here?
The workaround (and I really call it a workaround, not a solution) is
to strip the faulty revision from the central repository and all its
clones. But with a growing developer base, this is a situation that I
can't repeat over and over when such errors would re-occur.
Ringo
More information about the Mercurial
mailing list