Request: 'hg import' should produce conflict markers

Jordi GutiƩrrez Hermoso jordigh at octave.org
Tue Jul 7 08:26:01 CDT 2015


On Mon, 2015-07-06 at 15:27 -0500, Matt Mackall wrote:
> You can do this today:
> 
>  - write a script that does your patch --merge + exit 0
>  - do hg import with that 
>  - hg commit --amend after you fix up

I don't get this. How would this work? You do `patch --merge`, and
then your working directory is in some state. You fix that and now
your working directory contains the patch. How do you proceed to
easily extract the commit message from the patch and create a commit
with it? With `hg import`? What's the `hg commit --amend` for thenx?

For that matter, what do *you* do? You're in a similar position with
how you accept patches to hg. I don't think you always request that
people resend the patch themselves every time when it fails to apply,
do you?




More information about the Mercurial-devel mailing list