[PATCH 2 of 2 V2] dirstate: track otherparent files same as nonnormal

Martin von Zweigbergk martinvonz at google.com
Wed Mar 8 19:31:01 EST 2017


On Wed, Mar 8, 2017 at 4:16 PM, Durham Goode <durham at fb.com> wrote:
>
>
> On 3/8/17 4:14 PM, Martin von Zweigbergk wrote:
>>
>> On Wed, Mar 8, 2017 at 4:10 PM, Pierre-Yves David
>> <pierre-yves.david at ens-lyon.org> wrote:
>>>
>>>
>>>
>>> On 03/07/2017 09:29 AM, Augie Fackler wrote:
>>>>
>>>>
>>>> On Sun, Mar 05, 2017 at 04:51:01PM -0800, Durham Goode wrote:
>>>>>
>>>>>
>>>>> # HG changeset patch
>>>>> # User Durham Goode <durham at fb.com>
>>>>> # Date 1488761157 28800
>>>>> #      Sun Mar 05 16:45:57 2017 -0800
>>>>> # Node ID a465bc91a3c1a04c9c75a3cbd13fd5b777487de9
>>>>> # Parent  4a751a57ef0682dc3d7e46bdfa67a26b13cd9031
>>>>> dirstate: track otherparent files same as nonnormal
>>>>
>>>>
>>>>
>>>> Very nice. Queued.
>>>
>>>
>>>
>>> That changesets changes the signature of a function in compiled module.
>>> This
>>> force a `hg make local` every time the boundary created by this revision
>>> is
>>> crossed.
>>>
>>> In the past we have tried hard to not create such situation, should we do
>>> something to smooth things in this specific instance?
>>
>>
>> Good catch. This is perhaps why some tests failed for me for much of
>> the afternoon.
>
>
> Good point.  Feel free to drop #2 from the queue and I can resend with a
> backwards compatible version.

Done. Although I probably did it incorrectly, so it wouldn't surprise
me if your old commit is there too.


More information about the Mercurial-devel mailing list