equal
deleted
inserted
replaced
3 -------------- |
3 -------------- |
4 resolving manifests |
4 resolving manifests |
5 overwrite None partial False |
5 overwrite None partial False |
6 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7 |
6 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7 |
7 rev: versions differ -> m |
7 rev: versions differ -> m |
8 a: remote copied -> m |
8 a: remote copied to b -> m |
9 merging a and b |
9 merging a and b |
10 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 |
10 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 |
11 copying a to b |
11 copying a to b |
12 merging rev |
12 merging rev |
13 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 |
13 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 |
24 -------------- |
24 -------------- |
25 resolving manifests |
25 resolving manifests |
26 overwrite None partial False |
26 overwrite None partial False |
27 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71 |
27 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71 |
28 a: remote is newer -> g |
28 a: remote is newer -> g |
29 b: local copied -> m |
29 b: local copied to a -> m |
30 rev: versions differ -> m |
30 rev: versions differ -> m |
31 getting a |
31 getting a |
32 merging b and a |
32 merging b and a |
33 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337 |
33 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337 |
34 merging rev |
34 merging rev |
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 a: remote moved -> m |
50 a: remote moved to b -> m |
51 rev: versions differ -> 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 |
66 test L:nm a b R:up a W: - 4 get remote change to b |
66 test L:nm a b R:up a W: - 4 get remote change to b |
67 -------------- |
67 -------------- |
68 resolving manifests |
68 resolving manifests |
69 overwrite None partial False |
69 overwrite None partial False |
70 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71 |
70 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71 |
71 b: local moved -> m |
71 b: local moved to a -> m |
72 rev: versions differ -> m |
72 rev: versions differ -> m |
73 merging b and a |
73 merging b and a |
74 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 |
74 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 |
75 merging rev |
75 merging rev |
76 my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
76 my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
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 a: remote moved -> m |
354 a: remote moved to b -> m |
355 rev: versions differ -> 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 |
370 test L:um a b R:up a W: - 21 merge a and b to b |
370 test L:um a b R:up a W: - 21 merge a and b to b |
371 -------------- |
371 -------------- |
372 resolving manifests |
372 resolving manifests |
373 overwrite None partial False |
373 overwrite None partial False |
374 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71 |
374 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71 |
375 b: local moved -> m |
375 b: local moved to a -> m |
376 rev: versions differ -> m |
376 rev: versions differ -> m |
377 merging b and a |
377 merging b and a |
378 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 |
378 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 |
379 merging rev |
379 merging rev |
380 my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
380 my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
389 test L:nm a b R:up a c W: - 23 get c, keep b |
389 test L:nm a b R:up a c W: - 23 get c, keep b |
390 -------------- |
390 -------------- |
391 resolving manifests |
391 resolving manifests |
392 overwrite None partial False |
392 overwrite None partial False |
393 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f |
393 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f |
394 b: local moved -> m |
394 b: local moved to a -> m |
395 rev: versions differ -> m |
395 rev: versions differ -> m |
396 c: remote created -> g |
396 c: remote created -> g |
397 merging b and a |
397 merging b and a |
398 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 |
398 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 |
399 getting c |
399 getting c |