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

Uwe Brauer oub at mat.ucm.es
Wed Jan 11 19:49:21 UTC 2017


   > Uwe Brauer <oub at mat.ucm.es> writes:


   > This is because the merge does not exist yet on the vs-11.89
   > branch. However when you now do some work on default and merge it into
   > vs-11.89, you will introduce the backout of vs-11.89 into vs-11.89,
   > undoing the work you did there.


   > In that case you can simply backout the bad commit in vs-11.89 and then
   > merge vs-11.89 into default again.

By backout you mean

 hg revert --all -r number

Not
 hg backout -r number

Because according to the documentation these two operations might not be
identical.

Uwe 
   > Best wishes,
   > Arne




More information about the Mercurial mailing list