[PATCH stable?] import: respect diff.noprefix config (issue4639)

Pierre-Yves David pierre-yves.david at ens-lyon.org
Fri Jan 22 13:15:41 CST 2016



On 01/22/2016 10:43 AM, Siddharth Agarwal wrote:
> On 1/22/16 06:51, Ryan McElroy wrote:
>> # HG changeset patch
>> # User Ryan McElroy <rmcelroy at fb.com>
>> # Date 1453473839 28800
>> #      Fri Jan 22 06:43:59 2016 -0800
>> # Branch stable
>> # Node ID 40555a31b98b027c91b1ccf61477151b3307deb2
>> # Parent  158bdc8965720ca4061f8f8d806563cfc7cdb62e
>> import: respect diff.noprefix config (issue4639)
>>
>> Previously export-import round-trips would not work if diff.nopreofix was
>> truthy, because import did not pay attention to that setting. Now we
>> inspect
>> that setting unless an explicit strip level is specified.
>
> I don't think this is the right solution here -- much of the time hg
> import is used on a repository that's different from the one where hg
> export was used. Could we figure out from the patch whether to use -p0
> or -p1?

I'm pretty unenthusiastic for this solution too. changing the behavior 
of import based on an option meant for diff display seems sloppy to me.

I all cases, this is too much of a behavior change for the freeze. Let's 
discuss it in February.

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list