[PATCH 4 of 4 mergedriver] merge: move almost all change/delete conflicts to resolve phase (BC) (API)

[Pierre-Yves David]

On 12/03/2015 07:19 PM, Matt Harbison wrote:
> On Mon, 30 Nov 2015 17:25:09 -0500, Siddharth Agarwal <sid0 at fb.com> wrote:
>
>> # HG changeset patch
>> # User Siddharth Agarwal <sid0 at fb.com>
>> # Date 1448490333 28800
>> #      Wed Nov 25 14:25:33 2015 -0800
>> # Node ID 2d7ab840e26d1a5dfc1483c21e8bf0cbb1babafa
>> # Parent  e4745330dbb979cc776cf909c4355425f145ebaa
>> # Available At http://42.netv6.net/sid0-wip/hg/
>> #              hg pull http://42.netv6.net/sid0-wip/hg/ -r 2d7ab840e26d
>> merge: move almost all change/delete conflicts to resolve phase (BC)
>> (API)
>
> Not sure why, but I'm seeing this on Windows:
>
> --- c:/Users/Matt/Projects/hg/tests/test-subrepo-missing.t
> +++ c:/Users/Matt/Projects/hg/tests/test-subrepo-missing.t.err
> @@ -64,8 +64,12 @@
>     $ hg up 0
>     remote changed .hgsubstate which local deleted
>     use (c)hanged version or leave (d)eleted? c
> +   subrepository subrepo diverged (local revision: , remote revision:
> 07f494440405)
> +  (M)erge, keep (l)ocal or keep (r)emote? m
> +  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>     1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>     $ hg st
> +  M .hgsubstate
>     $ ls subrepo
>     a
>
> I'd write it off because you mention not dealing with .hgsubstate
> conflicts below, but the test runs fine on Linux.  I didn't try OS X.  I
> can file a bug if it isn't an issue you are aware of/have a ready fix for.

Please do file a bug.

-- 
Pierre-Yves David