equal
deleted
inserted
replaced
45 test L:up a R:nm a b W: - 3 get local a change to b, remove a |
45 test L:up a R:nm a b W: - 3 get local a change to b, remove a |
46 -------------- |
46 -------------- |
47 resolving manifests |
47 resolving manifests |
48 overwrite None partial False |
48 overwrite None partial False |
49 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b |
49 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b |
|
50 rev: versions differ -> m |
50 a: remote moved to b -> m |
51 a: remote moved to b -> m |
51 rev: versions differ -> m |
|
52 merging a and b |
52 merging a and b |
53 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 |
53 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 |
54 copying a to b |
54 copying a to b |
55 removing a |
55 removing a |
56 merging rev |
56 merging rev |
349 test L:up a R:um a b W: - 20 merge a and b to b, remove a |
349 test L:up a R:um a b W: - 20 merge a and b to b, remove a |
350 -------------- |
350 -------------- |
351 resolving manifests |
351 resolving manifests |
352 overwrite None partial False |
352 overwrite None partial False |
353 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 |
353 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 |
|
354 rev: versions differ -> m |
354 a: remote moved to b -> m |
355 a: remote moved to b -> m |
355 rev: versions differ -> m |
|
356 merging a and b |
356 merging a and b |
357 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 |
357 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 |
358 copying a to b |
358 copying a to b |
359 removing a |
359 removing a |
360 merging rev |
360 merging rev |