Disable backing out merges?
angel.ezquerra at gmail.com
Thu Oct 6 15:51:14 CDT 2011
On Thu, Oct 6, 2011 at 9:45 PM, Matt Mackall <mpm at selenic.com> wrote:
> Seems a bunch of people are trying to use backout to deal with broken
> merges. That doesn't work:
> - it's not well-defined what the result should be
> - we can't actually erase the problematic DAG edge
> So it seems like we should just refuse to do it until we get a lot
> smarter here.
Say I have made a merge and pushed it. Later I realize that it is a
bad merge and I want to get rid of it.
If it is not possible to back it out. What are the alternatives?
I could redo the merge, but then wouldn't that create a new head when
I push it? Perhaps I would need to also perform a dummy merge between
the old, bad merge, and the new, good one? Or maybe I could close the
merge branch? Would that work?
More information about the Mercurial-devel