Disable backing out merges?

Arne Babenhauserheide arne_bab at web.de
Thu Oct 6 15:45:55 CDT 2011


Am Donnerstag, 6. Oktober 2011, 14:45:22 schrieb Matt Mackall:
> 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.

What about people who want to backout a set of changes which includes merges? 

The only way to get rid of them after subsequent pushed commits are clean 
backouts.

Why not just *suggest* using revert instead when backout is used on a merge? 
Or fix the backout logic?

Best wishes, 
Arne
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 316 bytes
Desc: This is a digitally signed message part.
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20111006/d694e0fa/attachment.pgp>


More information about the Mercurial-devel mailing list