This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7974

merge: when rename was made on both sides, use ancestor as merge base
ClosedPublic

Authored by martinvonz on Jan 23 2020, 1:44 AM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb4057d001760: merge: when rename was made on both sides, use ancestor as merge base
Summary

When both sides of a merge have renamed a file to the same place, we
would treat that as a "both created" action in merge.py. That means
that we'd use an empty diffbase. It seems better to use the copy
source as diffbase. That can be done by simply dropping code that
prevented us from doing that. I think I did it that way in
57203e0210f8 (copies: calculate mergecopies() based on pathcopies(),
2019-04-11) only to preserve the existing behavior. I also suspect it
was just an accident that it behaved that way before that commit.

Note that until fa9ad1da2e77 (merge: start using the per-side copy
dicts, 2020-01-23), it was non-deterministic (depending on iteration
order of the allsources set in copies._fullcopytracing()) which
source was used in the affected test case in test-rename-merge1.t. We
could easily have fixed that by sorting them, but now we can instead
detect the case (the TODO added in the previous patch).

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Jan 23 2020, 1:44 AM
martinvonz added a comment.Jan 24 2020, 1:06 PM

I'll insert another patch with another fun test case before this patch soon

durin42 requested changes to this revision.Jan 29 2020, 5:57 PM
durin42 added a subscriber: durin42.

This one needs rebased.

This revision now requires changes to proceed.Jan 29 2020, 5:57 PM
martinvonz updated this revision to Diff 19689.Jan 29 2020, 6:32 PM
martinvonz added a comment.Jan 29 2020, 6:32 PM
In D7974#118492, @durin42 wrote:

This one needs rebased.

Done.

pulkit accepted this revision.Jan 30 2020, 9:53 AM
pulkit added a comment.Jan 30 2020, 10:17 AM

test-rename-merge1.t fails with this patch. Looks like there is one more instance of prompt which is not needed anymore. I didn't amend that in flight as I was not sure.

martinvonz added a comment.Jan 30 2020, 10:28 AM
In D7974#118682, @pulkit wrote:

test-rename-merge1.t fails with this patch. Looks like there is one more instance of prompt which is not needed anymore. I didn't amend that in flight as I was not sure.

I'm pretty sure it's flaky for some reason. Augie also mentioned that that test failed on one of my patches. I ran it 100 times with different python hashes and it never failed for me. I don't know why it behaves differently sometimes. I'm not even sure it started failing with this patch. Does it fail consistently on this one for you? Does it pass consistently on @?

martinvonz added a comment.Jan 30 2020, 10:29 AM
In D7974#118685, @martinvonz wrote:
In D7974#118682, @pulkit wrote:

test-rename-merge1.t fails with this patch. Looks like there is one more instance of prompt which is not needed anymore. I didn't amend that in flight as I was not sure.

I'm pretty sure it's flaky for some reason. Augie also mentioned that that test failed on one of my patches. I ran it 100 times with different python hashes and it never failed for me. I don't know why it behaves differently sometimes. I'm not even sure it started failing with this patch. Does it fail consistently on this one for you? Does it pass consistently on @?

Oh, and note that --runs-per-test=100 will run the test 100 times with the *same* python hash.

pulkit added a comment.Jan 31 2020, 12:00 PM

I am seeing this failure, hope it helps:

(vm)~/repo/hgpush/tests$ ./run-tests.py test-rename-merge1.t          
running 1 tests using 1 parallel processes                                                      
                                                                            
--- /home/pulkit/repo/hgpush/tests/test-rename-merge1.t    
+++ /home/pulkit/repo/hgpush/tests/test-rename-merge1.t.err                  
@@ -219,16 +219,6 @@                                                                  
    ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
    preserving z for resolve of z                              
   starting 4 threads for background file closing (?)                     
-   x: prompt changed/deleted -> m (premerge)                           
-  picked tool ':prompt' for x (binary False symlink False changedelete True)
-  file 'x' was deleted in other [merge rev] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.                
-  What do you want to do? u                                              
-   y: prompt deleted/changed -> m (premerge)                                
-  picked tool ':prompt' for y (binary False symlink False changedelete True)        
-  file 'y' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u                                 
    z: both renamed from y -> m (premerge)                            
   picked tool ':merge3' for z (binary False symlink False changedelete False)                  
   merging z                                                                
                                                                         
ERROR: test-rename-merge1.t output changed                                   
!                                                                                     
Failed test-rename-merge1.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.
python hash seed: 3001008644
martinvonz added a comment.Jan 31 2020, 12:20 PM
In D7974#118853, @pulkit wrote:

I am seeing this failure, hope it helps:

(vm)~/repo/hgpush/tests$ ./run-tests.py test-rename-merge1.t          
running 1 tests using 1 parallel processes                                                      
--- /home/pulkit/repo/hgpush/tests/test-rename-merge1.t    
+++ /home/pulkit/repo/hgpush/tests/test-rename-merge1.t.err                  
@@ -219,16 +219,6 @@                                                                  
    ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
    preserving z for resolve of z                              
   starting 4 threads for background file closing (?)                     
-   x: prompt changed/deleted -> m (premerge)                           
-  picked tool ':prompt' for x (binary False symlink False changedelete True)
-  file 'x' was deleted in other [merge rev] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.                
-  What do you want to do? u                                              
-   y: prompt deleted/changed -> m (premerge)                                
-  picked tool ':prompt' for y (binary False symlink False changedelete True)        
-  file 'y' was deleted in local [working copy] but was modified in other [merge rev].
-  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
-  What do you want to do? u                                 
    z: both renamed from y -> m (premerge)                            
   picked tool ':merge3' for z (binary False symlink False changedelete False)                  
   merging z                                                                
ERROR: test-rename-merge1.t output changed                                   
!                                                                                     
Failed test-rename-merge1.t: output changed
# Ran 1 tests, 0 skipped, 1 failed.
python hash seed: 3001008644

Consistently?

martinvonz edited the summary of this revision. (Show Details)Jan 31 2020, 6:42 PM
martinvonz updated this revision to Diff 19803.
pulkit accepted this revision.Jan 31 2020, 6:43 PM
martinvonz added a commit: rHGb4057d001760: merge: when rename was made on both sides, use ancestor as merge base.Feb 3 2020, 8:48 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb4057d001760: merge: when rename was made on both sides, use ancestor as merge base (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 19568

mercurial/copies.py

if src not in m1: if src not in m1:
# renamed on side 1, deleted on side 2 # renamed on side 1, deleted on side 2
renamedelete[src] = dsts1 renamedelete[src] = dsts1
elif m2[src] != mb[src]: elif m2[src] != mb[src]:
if not _related(c2[src], base[src]): if not _related(c2[src], base[src]):
return return
# modified on side 2 # modified on side 2
for dst in dsts1: for dst in dsts1:
if dst not in m2:
# dst not added on side 2 (handle as regular
# "both created" case in manifestmerge otherwise)
copy[dst] = src copy[dst] = src
class branch_copies(object): class branch_copies(object):
"""Information about copies made on one side of a merge/graft. """Information about copies made on one side of a merge/graft.
"copy" is a mapping from destination name -> source name, "copy" is a mapping from destination name -> source name,
where source is in c1 and destination is in c2 or vice-versa. where source is in c1 and destination is in c2 or vice-versa.

tests/test-rename-merge1.t

# We should probably tell the user about the conflicting rename sources. # We should probably tell the user about the conflicting rename sources.
# Depending on which side they pick, we should take that rename and get # Depending on which side they pick, we should take that rename and get
# the changes to the source from the other side. The unchanged file should # the changes to the source from the other side. The unchanged file should
# remain. # remain.
# we should not get the prompts about modify/delete conflicts # we should not get the prompts about modify/delete conflicts
$ hg merge --debug 1 -t :merge3 $ hg merge --debug 1 -t :merge3
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on local side: on local side:
src: 'y' -> dst: 'z' src: 'y' -> dst: 'z' *
on remote side: on remote side:
src: 'x' -> dst: 'z' src: 'x' -> dst: 'z' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508 ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
preserving x for resolve of x
preserving z for resolve of z preserving z for resolve of z
x: prompt changed/deleted -> m (premerge) z: both renamed from y -> m (premerge)
picked tool ':prompt' for x (binary False symlink False changedelete True)
file 'x' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
y: prompt deleted/changed -> m (premerge)
picked tool ':prompt' for y (binary False symlink False changedelete True)
file 'y' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
z: both created -> m (premerge)
picked tool ':merge3' for z (binary False symlink False changedelete False) picked tool ':merge3' for z (binary False symlink False changedelete False)
merging z merging z
my z@07fcbc9a74ed+ other z@f21419739508 ancestor z@000000000000 my z@07fcbc9a74ed+ other z@f21419739508 ancestor y@5151c134577e
z: both created -> m (merge) premerge successful
picked tool ':merge3' for z (binary False symlink False changedelete False) 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
my z@07fcbc9a74ed+ other z@f21419739508 ancestor z@000000000000 (branch merge, don't forget to commit)
warning: conflicts while merging z! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 3 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ ls $ ls
x x
y
z z
z.orig
$ cat x $ cat x
x x
foo foo
$ cat y
y
foo
# 'z' should have had the added 'foo' line # 'z' should have had the added 'foo' line
$ cat z $ cat z
<<<<<<< working copy: 07fcbc9a74ed - test: modify x, rename y to z
y
||||||| base
=======
x x
>>>>>>> merge rev: f21419739508 - test: modify y, rename x to z

tests/test-rename-merge2.t

$ tm "nc a b" "up a b" " " "14 merge b no ancestor" $ tm "nc a b" "up a b" " " "14 merge b no ancestor"
created new head created new head
-------------- --------------
test L:nc a b R:up a b W: - 14 merge b no ancestor test L:nc a b R:up a b W: - 14 merge b no ancestor
-------------- --------------
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on local side: on local side:
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
a: remote is newer -> g a: remote is newer -> g
getting a getting a
b: both created -> m (premerge) b: both renamed from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
b: both created -> m (merge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge) rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
1 files updated, 2 files merged, 0 files removed, 0 files unresolved 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
$ tm "nc a b" "up a b" " " "16 get a, merge b no ancestor" $ tm "nc a b" "up a b" " " "16 get a, merge b no ancestor"
created new head created new head
-------------- --------------
test L:nc a b R:up a b W: - 16 get a, merge b no ancestor test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
-------------- --------------
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on local side: on local side:
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
a: remote is newer -> g a: remote is newer -> g
getting a getting a
b: both created -> m (premerge) b: both renamed from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
b: both created -> m (merge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge) rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
1 files updated, 2 files merged, 0 files removed, 0 files unresolved 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M a M a
M b M b
-------------- --------------
$ tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor" $ tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor"
created new head created new head
-------------- --------------
test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
-------------- --------------
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on remote side: on remote side:
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
b: both created -> m (premerge) b: both renamed from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
b: both created -> m (merge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge) rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
C a C a
-------------- --------------
$ tm "nm a b" "up a b" " " "18 merge b no ancestor" $ tm "nm a b" "up a b" " " "18 merge b no ancestor"
created new head created new head
-------------- --------------
test L:nm a b R:up a b W: - 18 merge b no ancestor test L:nm a b R:up a b W: - 18 merge b no ancestor
-------------- --------------
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on local side: on local side:
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
a: prompt deleted/changed -> m (premerge) b: both renamed from a -> m (premerge)
picked tool ':prompt' for a (binary False symlink False changedelete True)
file 'a' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
b: both created -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 my b@02963e448370+ other b@8dbce441892a ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
b: both created -> m (merge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge) rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 1 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon (branch merge, don't forget to commit)
-------------- --------------
M a
M b M b
abort: unresolved merge conflicts (see 'hg help resolve')
-------------- --------------
$ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a"
created new head created new head
-------------- --------------
test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
-------------- --------------
all copies found (* = to merge, ! = divergent, % = renamed and deleted): all copies found (* = to merge, ! = divergent, % = renamed and deleted):
on remote side: on remote side:
src: 'a' -> dst: 'b' src: 'a' -> dst: 'b' *
checking for directory renames checking for directory renames
resolving manifests resolving manifests
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
preserving a for resolve of a
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
b: both renamed from a -> m (premerge)
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
a: prompt changed/deleted -> m (premerge)
picked tool ':prompt' for a (binary False symlink False changedelete True)
file 'a' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
b: both created -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
b: both created -> m (merge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge) rev: versions differ -> m (merge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 1 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon (branch merge, don't forget to commit)
-------------- --------------
M b M b
C a C a
abort: unresolved merge conflicts (see 'hg help resolve')
-------------- --------------
$ tm "up a " "um a b" " " "20 merge a and b to b, remove a" $ tm "up a " "um a b" " " "20 merge a and b to b, remove a"
created new head created new head
-------------- --------------
test L:up a R:um a b W: - 20 merge a and b to b, remove a test L:up a R:um a b W: - 20 merge a and b to b, remove a
-------------- --------------
unmatched files in other: unmatched files in other: