Request: 'hg import' should produce conflict markers

Nathan Ridge zeratul976 at
Wed Jul 8 18:58:11 CDT 2015

> Subject: Re: Request: 'hg import' should produce conflict markers
> From: jordigh at
> To: zeratul976 at
> CC: mpm at; mercurial-devel at
> Date: Tue, 7 Jul 2015 14:13:49 -0400
> On Tue, 2015-07-07 at 16:13 +0000, Nathan Ridge wrote:
>> If I'm understanding the suggestion correctly, it's to make the
>> script (that wraps 'patch --merge' and exits with 0) the ui.patch
>> tool.
> Oh, I see.
> Yeah, that seems reasonable to me too. And fits with our general
> philosophy of "don't overcomplicate hg for someone's edge case".

The remaining thing necessary for this workflow to be usable is for bug
4745 [1] to be fixed, so that there is output that allows me to distinguish
between the cases where the merge left conflicts from the cases where 
it did not.



More information about the Mercurial-devel mailing list