[PATCH 6 of 6 mergedriver] localrepo.commit: disallow commit when driver-resolved files exist

Matt Mackall mpm at selenic.com
Fri Oct 16 17:13:44 CDT 2015


On Fri, 2015-10-16 at 22:58 +0100, Pierre-Yves David wrote:
> 
> On 10/16/2015 10:56 PM, Matt Mackall wrote:
> > On Thu, 2015-10-15 at 01:44 -0700, Siddharth Agarwal wrote:
> >> On 10/14/15 16:52, Siddharth Agarwal wrote:
> >>> # HG changeset patch
> >>> # User Siddharth Agarwal <sid0 at fb.com>
> >>> # Date 1444863883 25200
> >>> #      Wed Oct 14 16:04:43 2015 -0700
> >>> # Node ID 3328de735f306b8057e0b9ede6b518959cd7dfdc
> >>> # Parent  9f41136f7fa1528e16445da843b63945fbe27857
> >>> localrepo.commit: disallow commit when driver-resolved files exist
> >>
> >> A slightly fixed version of these patches + a followup set of 14 more
> >> are available via
> >>
> >> hg pull http://42.netv6.net/sid0-wip/hg/ -r 0d4a0d43fcc2
> >
> > I'd generally prefer a resend. Also, this is what the # url syntax is
> > for.
> 
> I remember glorious day where I provided you a http://blah.org/wip/#hash 
> url that resulted into giving your terminal:
> 
>    hg pull http://blah.org/wip/#hash
> 
> The # being used for comment, you pulled every single ofr my wip 
> changesets and crappy bookmark and spend the next hour cleaning things 
> up. That day I decided to never usr the # url syntax again.

I vaguely remember that. Fair enough.

-- 
Mathematics is the supreme nostalgia of our time.



More information about the Mercurial-devel mailing list