Disable backing out merges?

Greg Ward greg-hg at gerg.ca
Thu Oct 6 21:05:04 CDT 2011


On Thu, Oct 6, 2011 at 3: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.

+1

Digression: have you (or anyone else) noticed people doing silly thing
like merging default to branch 1.0 when they meant to go the other
way? I was sufficiently worried about the possibility at work that I
wrote a precommit hook to stop it. (And I have a mechanism to control
everyone's .hgrc, so I can specify commit-time hooks.) Is this worth
generalizing, e.g. should we have some way of specifying local merge
policy and preventing dumb merges?

Greg


More information about the Mercurial-devel mailing list