[PATCH V2] checkcopies: don't lose origin of file during merge (issue4748)

Pierre-Yves David pierre-yves.david at ens-lyon.org
Fri Jul 17 18:20:05 CDT 2015



On 07/17/2015 02:20 AM, Matt Mackall wrote:
> On Thu, 2015-07-16 at 10:33 +0200, Jeremy Parente wrote:
>> # HG changeset patch
>> # User Jeremy Parente <jeremy.parente at oneaccess-net.com>
>> # Date 1437035066 -7200
>> #      Thu Jul 16 10:24:26 2015 +0200
>> # Branch stable
>> # Node ID abd4cab8a1bac17d149ec44c36e9f556670c14b1
>> # Parent  540cd0ddac49c1125b2e013aa2ff18ecbd4dd954
>> checkcopies: don't lose origin of file during merge (issue4748)
>
> Ok, I've spent most of today thinking about this and I've decided I'm
> going to have to reject it. It's a lovely patch and you did in fact find
> the right place to make the change, and the test changes look good too,
> but I'm afraid it bumps up against deeper theoretical concerns.

Should we add the explanation below in the code as comment to avoid 
someone else trying the same thing later?


-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list