merged two branches, and pushed, how to backout/strip?

Uwe Brauer oub at mat.ucm.es
Tue Jan 10 19:32:55 UTC 2017



   > Assuming you didn't leave out steps between your two reverts you are
   > now worse off because that last commit isn't backing out a bad merge
   > from vs-11.89, it's replacing everything on default with your last
   > revision from vs-11.89.

Oops that is not good.

But that changeset (4) belongs to vs-11.89.

If I run
hg up vs 11.89 and then
hg revert --all -r 4
hg ci -m "backout the backout"

I obtain
nothing changed

   > If the bad merge is only bad because it was committed to the wrong
   > branch, then instead of reverting to the last good commit in vs-11.89,

No this is not the case, the merge is bad, because there was a bad
commit in vs-11.89


Ok I have to rethink that again.

Uwe 



More information about the Mercurial mailing list