[PATCH 2 of 6] ignore: throw exception for bad syntax (BC)
Matt Mackall
mpm at selenic.com
Mon May 18 16:52:05 CDT 2015
On Mon, 2015-05-18 at 15:48 -0500, Pierre-Yves David wrote:
>
> On 05/18/2015 03:28 PM, Matt Mackall wrote:
> > On Mon, 2015-05-18 at 11:28 -0700, Durham Goode wrote:
> >> # HG changeset patch
> >> # User Durham Goode <durham at fb.com>
> >> # Date 1431815649 25200
> >> # Sat May 16 15:34:09 2015 -0700
> >> # Node ID f0bebbe084ce886b7b42999d2f8b82cc6d4b6523
> >> # Parent ef85707822930cf344e59353e784f1f0223e257c
> >> ignore: throw exception for bad syntax (BC)
> >
> > This looks mostly good, except:
>
> I think this is too harsh to crash here.
Yeah, on reflection, I agree with this. I think I've successfully fixed
the merge conflicts after dropping 2 of 6, so these are queued for
default.
--
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial-devel
mailing list