Request: 'hg import' should produce conflict markers

Jordi GutiƩrrez Hermoso jordigh at
Mon Jul 6 15:06:06 CDT 2015

On Mon, 2015-07-06 at 19:12 +0000, Nathan Ridge wrote:
> Let me propose something more modest then, that would still help me
> tremendously:
>    - Continue relying on an external patch tool to produce the conflict 
>      markers.
>    - If the patch tool exits with exit code 0, perform the commit (this
>      is already done).
>    - If the patch tool exits with an nonzero exit code, remember the
>      commit metadata, and perform the commit upon 'hg import --continue'.
> That seems like it should be very straightforward to implement.

Yes, this isn't so bad, seems reasonable, and is not terrible to
implement. It wouldn't be a whole merge state like you get with hg
rebase and hg merge, but I think the rest of it could be done.

I won't promise that I will do this myself, but it's a reasonable
feature request. Let's throw it in the bug tracker.

More information about the Mercurial-devel mailing list