rollback/backout a wrong merge between named branches?

[Dennis Brakhane]

On Thu, Oct 8, 2009 at 4:57 PM, Ringo De Smet <ringo.desmet at gmail.com> wrote:
> 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?

That's what backout is for.

I think the following should work (if someone on this list thinks I'm
missing something here, don't hesitate to answer)

REV is the revision or changeset number of the merge changeset

$ hg log -r REV

This revision will have to parents, write down the number of the
parent that lies in the 'default' branch, DEF_PAR_REV

$ hg backout REVISION_OF_MERGE_CHANGESET --parent DEF_PAR_REV

$ hg merge

$ hg commit