[PATCH 2 of 4] BUGGY: merge: use ancestor filename from planning phase instead of filectx ancestor
Mads Kiilerich
mads at kiilerich.com
Mon Feb 24 22:56:15 CST 2014
On 02/25/2014 05:50 AM, Mads Kiilerich wrote:
> --- a/tests/test-merge-types.t
> +++ b/tests/test-merge-types.t
> @@ -268,6 +268,7 @@ h: l vs l, different
> merging b
> warning: conflicts during merge.
> merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
> + warning: cannot merge flags for c
> merging d
> warning: internal:merge cannot merge symlinks for d
> merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
> @@ -328,6 +329,7 @@ h: l vs l, different
> merging b
> warning: conflicts during merge.
> merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
> + warning: cannot merge flags for c
> merging d
> warning: internal:merge cannot merge symlinks for d
> merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
> @@ -355,7 +357,7 @@ h: l vs l, different
> 2
> >>>>>>> other
> $ tellmeabout c
> - c is a plain file with content:
> + c is an executable file with content:
> x
> $ tellmeabout d
> d is an executable file with content:
I forgot to include:
@@ -480,7 +480,6 @@
1/g:
m1
1/g.base:
- a
1/g.local:
m1
1/g.orig:
/Mads
More information about the Mercurial-devel
mailing list