--- a/tests/test-rename-merge2.t Tue Jun 20 17:25:57 2017 -0400
+++ b/tests/test-rename-merge2.t Tue Jun 20 17:31:18 2017 -0400
@@ -47,7 +47,7 @@
> echo "--------------"
> echo "test L:$1 R:$2 W:$3 - $4"
> echo "--------------"
- > hg merge -y --debug --traceback --tool="python ../merge"
+ > hg merge -y --debug --traceback --tool="$PYTHON ../merge"
>
> echo "--------------"
> hg status -camC -X rev
@@ -90,18 +90,18 @@
preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: remote copied from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging a and b to b
my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -130,18 +130,18 @@
a: remote is newer -> g
getting a
b: local copied/moved from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b and a to b
my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -170,18 +170,18 @@
removing a
starting 4 threads for background file closing (?)
b: remote moved from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging a and b to b
my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -208,18 +208,18 @@
preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: local copied/moved from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b and a to b
my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -246,13 +246,13 @@
b: remote created -> g
getting b
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -278,13 +278,13 @@
preserving rev for resolve of rev
starting 4 threads for background file closing (?)
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -313,13 +313,13 @@
b: remote created -> g
getting b
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
1 files updated, 1 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -344,13 +344,13 @@
preserving rev for resolve of rev
starting 4 threads for background file closing (?)
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -373,22 +373,22 @@
preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: both renamed from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
b: both renamed from a -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -423,13 +423,13 @@
c: remote created -> g
getting c
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -453,22 +453,22 @@
preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
- launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -494,22 +494,22 @@
removing a
starting 4 threads for background file closing (?)
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
- launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -533,22 +533,22 @@
a: remote is newer -> g
getting a
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
- launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -574,22 +574,22 @@
removing a
starting 4 threads for background file closing (?)
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
- launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -613,22 +613,22 @@
a: remote is newer -> g
getting a
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
- launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -652,22 +652,22 @@
preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
- launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -695,22 +695,22 @@
other [merge rev] changed a which local [working copy] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
- launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
@@ -740,22 +740,22 @@
local [working copy] changed a which other [merge rev] deleted
use (c)hanged version, (d)elete, or leave (u)nresolved? u
b: both created -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
b: both created -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
- launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
@@ -784,22 +784,22 @@
removing a
starting 4 threads for background file closing (?)
b: remote moved from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging a and b to b
my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
b: remote moved from a -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -826,22 +826,22 @@
preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: local copied/moved from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b and a to b
my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
b: local copied/moved from a -> m (merge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
@@ -874,18 +874,18 @@
c: remote created -> g
getting c
b: local copied/moved from a -> m (premerge)
- picked tool 'python ../merge' for b (binary False symlink False changedelete False)
+ picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b and a to b
my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
premerge successful
rev: versions differ -> m (premerge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
rev: versions differ -> m (merge)
- picked tool 'python ../merge' for rev (binary False symlink False changedelete False)
+ picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
- launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob)
+ launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0
1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)