Disable backing out merges?
mpm at selenic.com
Sat Oct 8 18:18:36 CDT 2011
On Sun, 2011-10-09 at 00:59 +0200, Arne Babenhauserheide wrote:
> Am Samstag, 8. Oktober 2011, 12:45:51 schrieb Matt Mackall:
> > On Sat, 2011-10-08 at 15:19 +0200, Arne Babenhauserheide wrote:
> > > a-b-c-x ← broken
> > > \ /
> > > d
> > >
> > > A backout of c would need to make x a valid changeset,
> > I lost you right here. There are two completely different cases I'm
> > interested in:
> > a) merge should not have been done at all (ie merged default into
> > stable)
> > b) merge was done incorrectly (ie accidentally dropped changes)
> > This doesn't appear to be either of those. Backing out a non-merge
> > changeset like c is generally not a problem:
> Sorry that the graphics were not clear. c is a merge between b and d.
If you're going to draw a ASCII-art graph that other people can read,
you'll need to compose it using a fixed-width font. Not only do other
people not necessarily have a font with the same proportions as your
mail client, the mailing list strips out HTML text and converts it to
plain text, so everyone is getting your mail as plain text.
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial-devel