test-rename-merge2.out
601 lines
| 18.0 KiB
| text/plain
|
TextLexer
/ tests / test-rename-merge2.out
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:up a R:nc a b W: - 1 get local a to b | ||||
-------------- | ||||
|
r5387 | searching for copies back to rev 1 | ||
unmatched files in other: | ||||
b | ||||
all copies found (* = to merge, ! = divergent): | ||||
b -> a * | ||||
checking for directory renames | ||||
|
r8753 | resolving manifests | ||
overwrite None partial False | ||||
ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7 | ||||
|
r3252 | rev: versions differ -> m | ||
|
r3727 | a: remote copied to b -> m | ||
|
r6512 | preserving a for resolve of b | ||
preserving rev for resolve of rev | ||||
picked tool 'python ../merge' for b (binary False symlink False) | ||||
merging a and b to b | ||||
my b@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 | ||||
|
r6004 | premerge successful | ||
picked tool 'python ../merge' for rev (binary False symlink False) | ||||
|
r3252 | merging rev | ||
|
r3314 | my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 | ||
|
r3252 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M b | ||||
a | ||||
|
r5764 | C a | ||
|
r3252 | -------------- | ||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:nc a b R:up a W: - 2 get rem change to a and b | ||||
-------------- | ||||
|
r5387 | searching for copies back to rev 1 | ||
unmatched files in local: | ||||
b | ||||
all copies found (* = to merge, ! = divergent): | ||||
b -> a * | ||||
checking for directory renames | ||||
|
r8753 | resolving manifests | ||
overwrite None partial False | ||||
ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71 | ||||
|
r3252 | a: remote is newer -> g | ||
|
r8748 | b: local copied/moved to a -> m | ||
|
r3252 | rev: versions differ -> m | ||
|
r6512 | preserving b for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r3252 | getting a | ||
|
r6004 | picked tool 'python ../merge' for b (binary False symlink False) | ||
|
r6512 | merging b and a to b | ||
|
r3314 | my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337 | ||
|
r6004 | premerge successful | ||
picked tool 'python ../merge' for rev (binary False symlink False) | ||||
|
r3252 | merging rev | ||
|
r3314 | my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337 | ||
|
r3252 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M a | ||||
M b | ||||
|
r3292 | a | ||
|
r3252 | -------------- | ||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:up a R:nm a b W: - 3 get local a change to b, remove a | ||||
-------------- | ||||
|
r5387 | searching for copies back to rev 1 | ||
unmatched files in other: | ||||
b | ||||
all copies found (* = to merge, ! = divergent): | ||||
b -> a * | ||||
checking for directory renames | ||||
|
r8753 | resolving manifests | ||
overwrite None partial False | ||||
ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b | ||||
|
r3730 | rev: versions differ -> m | ||
|
r3727 | a: remote moved to b -> m | ||
|
r6512 | preserving a for resolve of b | ||
preserving rev for resolve of rev | ||||
removing a | ||||
picked tool 'python ../merge' for b (binary False symlink False) | ||||
merging a and b to b | ||||
my b@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 | ||||
|
r6004 | premerge successful | ||
picked tool 'python ../merge' for rev (binary False symlink False) | ||||
|
r3252 | merging rev | ||
|
r3314 | my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 | ||
|
r3252 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M b | ||||
a | ||||
-------------- | ||||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:nm a b R:up a W: - 4 get remote change to b | ||||
-------------- | ||||
|
r5387 | searching for copies back to rev 1 | ||
unmatched files in local: | ||||
b | ||||
all copies found (* = to merge, ! = divergent): | ||||
b -> a * | ||||
checking for directory renames | ||||
|
r8753 | resolving manifests | ||
overwrite None partial False | ||||
ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71 | ||||
|
r8748 | b: local copied/moved to a -> m | ||
|
r3252 | rev: versions differ -> m | ||
|
r6512 | preserving b for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r6004 | picked tool 'python ../merge' for b (binary False symlink False) | ||
|
r6512 | merging b and a to b | ||
|
r3314 | my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 | ||
|
r6004 | premerge successful | ||
picked tool 'python ../merge' for rev (binary False symlink False) | ||||
|
r3252 | merging rev | ||
|
r3314 | my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337 | ||
|
r3252 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M b | ||||
|
r3292 | a | ||
|
r3252 | -------------- | ||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L: R:nc a b W: - 5 get b | ||||
-------------- | ||||
|
r5387 | searching for copies back to rev 1 | ||
unmatched files in other: | ||||
b | ||||
all copies found (* = to merge, ! = divergent): | ||||
b -> a | ||||
checking for directory renames | ||||
|
r8753 | resolving manifests | ||
overwrite None partial False | ||||
ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7 | ||||
|
r3252 | rev: versions differ -> m | ||
|
r4416 | b: remote created -> g | ||
|
r6512 | preserving rev for resolve of rev | ||
|
r4416 | getting b | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 | ||
|
r3400 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
|
r3252 | (branch merge, don't forget to commit) | ||
-------------- | ||||
M b | ||||
|
r5764 | C a | ||
|
r3252 | -------------- | ||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:nc a b R: W: - 6 nothing | ||||
-------------- | ||||
|
r5387 | searching for copies back to rev 1 | ||
unmatched files in local: | ||||
b | ||||
all copies found (* = to merge, ! = divergent): | ||||
b -> a | ||||
checking for directory renames | ||||
|
r8753 | resolving manifests | ||
overwrite None partial False | ||||
ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336 | ||||
|
r3252 | rev: versions differ -> m | ||
|
r6512 | preserving rev for resolve of rev | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 | ||
|
r4416 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
|
r3252 | (branch merge, don't forget to commit) | ||
-------------- | ||||
|
r5764 | C a | ||
C b | ||||
|
r3252 | -------------- | ||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L: R:nm a b W: - 7 get b | ||||
-------------- | ||||
|
r5387 | searching for copies back to rev 1 | ||
unmatched files in other: | ||||
b | ||||
all copies found (* = to merge, ! = divergent): | ||||
b -> a | ||||
checking for directory renames | ||||
|
r8753 | resolving manifests | ||
overwrite None partial False | ||||
ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b | ||||
|
r4416 | a: other deleted -> r | ||
|
r3252 | rev: versions differ -> m | ||
|
r4416 | b: remote created -> g | ||
|
r6512 | preserving rev for resolve of rev | ||
|
r3252 | removing a | ||
|
r4416 | getting b | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337 | ||
|
r4416 | 1 files updated, 1 files merged, 1 files removed, 0 files unresolved | ||
|
r3252 | (branch merge, don't forget to commit) | ||
-------------- | ||||
M b | ||||
-------------- | ||||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:nm a b R: W: - 8 nothing | ||||
-------------- | ||||
|
r5387 | searching for copies back to rev 1 | ||
unmatched files in local: | ||||
b | ||||
all copies found (* = to merge, ! = divergent): | ||||
b -> a | ||||
checking for directory renames | ||||
|
r8753 | resolving manifests | ||
overwrite None partial False | ||||
ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336 | ||||
|
r3252 | rev: versions differ -> m | ||
|
r6512 | preserving rev for resolve of rev | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 | ||
|
r4416 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
|
r3252 | (branch merge, don't forget to commit) | ||
-------------- | ||||
|
r5764 | C b | ||
|
r3252 | -------------- | ||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:um a b R:um a b W: - 9 do merge with ancestor in a | ||||
-------------- | ||||
|
r8753 | searching for copies back to rev 1 | ||
|
r3252 | resolving manifests | ||
|
r3314 | overwrite None partial False | ||
ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7 | ||||
|
r3252 | b: versions differ -> m | ||
rev: versions differ -> m | ||||
|
r6512 | preserving b for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r6004 | picked tool 'python ../merge' for b (binary False symlink False) | ||
|
r3252 | merging b | ||
|
r3314 | my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337 | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337 | ||
|
r3252 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M b | ||||
-------------- | ||||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:nm a b R:nm a c W: - 11 get c, keep b | ||||
-------------- | ||||
|
r5387 | searching for copies back to rev 1 | ||
unmatched files in local: | ||||
b | ||||
unmatched files in other: | ||||
c | ||||
all copies found (* = to merge, ! = divergent): | ||||
|
r5857 | c -> a ! | ||
b -> a ! | ||||
|
r5387 | checking for directory renames | ||
|
r4674 | a: divergent renames -> dr | ||
|
r8753 | resolving manifests | ||
overwrite None partial False | ||||
ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2 | ||||
|
r3252 | rev: versions differ -> m | ||
c: remote created -> g | ||||
|
r6512 | preserving rev for resolve of rev | ||
|
r4674 | warning: detected divergent renames of a to: | ||
b | ||||
c | ||||
|
r3252 | getting c | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337 | ||
|
r3252 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M c | ||||
|
r5764 | C b | ||
|
r3252 | -------------- | ||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:nc a b R:up b W: - 12 merge b no ancestor | ||||
-------------- | ||||
|
r8753 | searching for copies back to rev 1 | ||
|
r3252 | resolving manifests | ||
|
r3314 | overwrite None partial False | ||
ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7 | ||||
|
r3252 | b: versions differ -> m | ||
rev: versions differ -> m | ||||
|
r6512 | preserving b for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r6004 | picked tool 'python ../merge' for b (binary False symlink False) | ||
|
r3252 | merging b | ||
|
r3314 | my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000 | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337 | ||
|
r3252 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M b | ||||
|
r5764 | C a | ||
|
r3252 | -------------- | ||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:up b R:nm a b W: - 13 merge b no ancestor | ||||
-------------- | ||||
|
r8753 | searching for copies back to rev 1 | ||
|
r3252 | resolving manifests | ||
|
r3314 | overwrite None partial False | ||
ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | ||||
|
r3252 | a: other deleted -> r | ||
b: versions differ -> m | ||||
rev: versions differ -> m | ||||
|
r6512 | preserving b for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r3252 | removing a | ||
|
r6004 | picked tool 'python ../merge' for b (binary False symlink False) | ||
|
r3252 | merging b | ||
|
r3314 | my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 | ||
|
r3252 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M b | ||||
-------------- | ||||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:nc a b R:up a b W: - 14 merge b no ancestor | ||||
-------------- | ||||
|
r8753 | searching for copies back to rev 1 | ||
|
r3252 | resolving manifests | ||
|
r3314 | overwrite None partial False | ||
ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | ||||
|
r3252 | a: remote is newer -> g | ||
b: versions differ -> m | ||||
rev: versions differ -> m | ||||
|
r6512 | preserving b for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r3252 | getting a | ||
|
r6004 | picked tool 'python ../merge' for b (binary False symlink False) | ||
|
r3252 | merging b | ||
|
r3314 | my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 | ||
|
r3252 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M a | ||||
M b | ||||
-------------- | ||||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:up b R:nm a b W: - 15 merge b no ancestor, remove a | ||||
-------------- | ||||
|
r8753 | searching for copies back to rev 1 | ||
|
r3252 | resolving manifests | ||
|
r3314 | overwrite None partial False | ||
ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b | ||||
|
r3252 | a: other deleted -> r | ||
b: versions differ -> m | ||||
rev: versions differ -> m | ||||
|
r6512 | preserving b for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r3252 | removing a | ||
|
r6004 | picked tool 'python ../merge' for b (binary False symlink False) | ||
|
r3252 | merging b | ||
|
r3314 | my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 | ||
|
r3252 | 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M b | ||||
-------------- | ||||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
|
r3281 | test L:nc a b R:up a b W: - 16 get a, merge b no ancestor | ||
|
r3252 | -------------- | ||
|
r8753 | searching for copies back to rev 1 | ||
|
r3252 | resolving manifests | ||
|
r3314 | overwrite None partial False | ||
ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a | ||||
|
r3252 | a: remote is newer -> g | ||
b: versions differ -> m | ||||
rev: versions differ -> m | ||||
|
r6512 | preserving b for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r3252 | getting a | ||
|
r6004 | picked tool 'python ../merge' for b (binary False symlink False) | ||
|
r3252 | merging b | ||
|
r3314 | my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 | ||
|
r3252 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M a | ||||
M b | ||||
-------------- | ||||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
|
r3281 | test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor | ||
|
r3252 | -------------- | ||
|
r8753 | searching for copies back to rev 1 | ||
|
r3252 | resolving manifests | ||
|
r3314 | overwrite None partial False | ||
ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7 | ||||
|
r3252 | b: versions differ -> m | ||
rev: versions differ -> m | ||||
|
r6512 | preserving b for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r6004 | picked tool 'python ../merge' for b (binary False symlink False) | ||
|
r3252 | merging b | ||
|
r3314 | my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000 | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337 | ||
|
r3252 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M b | ||||
|
r5764 | C a | ||
|
r3252 | -------------- | ||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:nm a b R:up a b W: - 18 merge b no ancestor | ||||
-------------- | ||||
|
r8753 | searching for copies back to rev 1 | ||
|
r3252 | resolving manifests | ||
|
r3314 | overwrite None partial False | ||
ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a | ||||
|
r3252 | b: versions differ -> m | ||
rev: versions differ -> m | ||||
|
r7320 | remote changed a which local deleted | ||
use (c)hanged version or leave (d)eleted? c | ||||
|
r3252 | a: prompt recreating -> g | ||
|
r6512 | preserving b for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r3252 | getting a | ||
|
r6004 | picked tool 'python ../merge' for b (binary False symlink False) | ||
|
r3252 | merging b | ||
|
r3314 | my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000 | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337 | ||
|
r3252 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M a | ||||
M b | ||||
-------------- | ||||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
|
r3281 | test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a | ||
|
r3252 | -------------- | ||
|
r8753 | searching for copies back to rev 1 | ||
|
r3252 | resolving manifests | ||
|
r3314 | overwrite None partial False | ||
ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b | ||||
|
r7320 | local changed a which remote deleted | ||
use (c)hanged version or (d)elete? c | ||||
|
r7768 | a: prompt keep -> a | ||
|
r3252 | b: versions differ -> m | ||
rev: versions differ -> m | ||||
|
r6512 | preserving b for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r6004 | picked tool 'python ../merge' for b (binary False symlink False) | ||
|
r3252 | merging b | ||
|
r3314 | my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000 | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337 | ||
|
r3252 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M b | ||||
|
r5764 | C a | ||
|
r3252 | -------------- | ||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:up a R:um a b W: - 20 merge a and b to b, remove a | ||||
-------------- | ||||
|
r5387 | searching for copies back to rev 1 | ||
unmatched files in other: | ||||
b | ||||
all copies found (* = to merge, ! = divergent): | ||||
b -> a * | ||||
checking for directory renames | ||||
|
r8753 | resolving manifests | ||
overwrite None partial False | ||||
ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 | ||||
|
r3730 | rev: versions differ -> m | ||
|
r3727 | a: remote moved to b -> m | ||
|
r6512 | preserving a for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r3252 | removing a | ||
|
r6512 | picked tool 'python ../merge' for b (binary False symlink False) | ||
merging a and b to b | ||||
my b@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 | ||||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337 | ||
|
r3252 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M b | ||||
a | ||||
-------------- | ||||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:um a b R:up a W: - 21 merge a and b to b | ||||
-------------- | ||||
|
r5387 | searching for copies back to rev 1 | ||
unmatched files in local: | ||||
b | ||||
all copies found (* = to merge, ! = divergent): | ||||
b -> a * | ||||
checking for directory renames | ||||
|
r8753 | resolving manifests | ||
overwrite None partial False | ||||
ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71 | ||||
|
r8748 | b: local copied/moved to a -> m | ||
|
r3252 | rev: versions differ -> m | ||
|
r6512 | preserving b for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r6004 | picked tool 'python ../merge' for b (binary False symlink False) | ||
|
r6512 | merging b and a to b | ||
|
r3314 | my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337 | ||
|
r3252 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M b | ||||
|
r3292 | a | ||
|
r3252 | -------------- | ||
|
r6336 | created new head | ||
|
r3252 | -------------- | ||
test L:nm a b R:up a c W: - 23 get c, keep b | ||||
-------------- | ||||
|
r5387 | searching for copies back to rev 1 | ||
unmatched files in local: | ||||
b | ||||
unmatched files in other: | ||||
c | ||||
all copies found (* = to merge, ! = divergent): | ||||
b -> a * | ||||
checking for directory renames | ||||
|
r8753 | resolving manifests | ||
overwrite None partial False | ||||
ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f | ||||
|
r8748 | b: local copied/moved to a -> m | ||
|
r3252 | rev: versions differ -> m | ||
c: remote created -> g | ||||
|
r6512 | preserving b for resolve of b | ||
preserving rev for resolve of rev | ||||
|
r6004 | picked tool 'python ../merge' for b (binary False symlink False) | ||
|
r6512 | merging b and a to b | ||
|
r3314 | my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 | ||
|
r6004 | premerge successful | ||
|
r3252 | getting c | ||
|
r6004 | picked tool 'python ../merge' for rev (binary False symlink False) | ||
|
r3252 | merging rev | ||
|
r3314 | my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337 | ||
|
r3252 | 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||
(branch merge, don't forget to commit) | ||||
-------------- | ||||
M b | ||||
|
r3292 | a | ||
|
r3252 | M c | ||
-------------- | ||||