Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-merge2.out @ 3314:ecc1bf27378c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: unify merge and copy actions
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 00:41:55 -0500
parents e7abcf3a7c5f
children 966632304dde
comparison
equal deleted inserted replaced
3313:f009a6f12a59 3314:ecc1bf27378c
3 -------------- 3 --------------
4 resolving manifests 4 resolving manifests
5 overwrite None branchmerge True partial False 5 overwrite None branchmerge True partial False
6 ancestor e300d1c794ec local 735846fee2d7 remote 924404dff337 6 ancestor e300d1c794ec local 735846fee2d7 remote 924404dff337
7 rev: versions differ -> m 7 rev: versions differ -> m
8 a: remote copied -> c 8 a: remote copied -> m
9 merging a and b to b 9 merging a and b to b
10 resolving a 10 resolving a
11 my a@. other b@735846fee2d7 ancestor a@924404dff337 11 my a@. other b@735846fee2d7 ancestor a@924404dff337
12 copying a to b 12 copying a to b
13 merging rev 13 merging rev
26 -------------- 26 --------------
27 resolving manifests 27 resolving manifests
28 overwrite None branchmerge True partial False 28 overwrite None branchmerge True partial False
29 ancestor ac809aeed39a local f4db7e329e71 remote 924404dff337 29 ancestor ac809aeed39a local f4db7e329e71 remote 924404dff337
30 a: remote is newer -> g 30 a: remote is newer -> g
31 b: local copied -> c 31 b: local copied -> m
32 rev: versions differ -> m 32 rev: versions differ -> m
33 getting a 33 getting a
34 merging b and a to b 34 merging b and a to b
35 resolving b 35 resolving b
36 my b@. other a@f4db7e329e71 ancestor a@924404dff337 36 my b@. other a@f4db7e329e71 ancestor a@924404dff337
49 test L:up a R:nm a b W: - 3 get local a change to b, remove a 49 test L:up a R:nm a b W: - 3 get local a change to b, remove a
50 -------------- 50 --------------
51 resolving manifests 51 resolving manifests
52 overwrite None branchmerge True partial False 52 overwrite None branchmerge True partial False
53 ancestor e300d1c794ec local e03727d2d66b remote 924404dff337 53 ancestor e300d1c794ec local e03727d2d66b remote 924404dff337
54 a: remote moved -> c 54 a: remote moved -> m
55 rev: versions differ -> m 55 rev: versions differ -> m
56 merging a and b to b 56 merging a and b to b
57 resolving a 57 resolving a
58 my a@. other b@e03727d2d66b ancestor a@924404dff337 58 my a@. other b@e03727d2d66b ancestor a@924404dff337
59 copying a to b 59 copying a to b
72 test L:nm a b R:up a W: - 4 get remote change to b 72 test L:nm a b R:up a W: - 4 get remote change to b
73 -------------- 73 --------------
74 resolving manifests 74 resolving manifests
75 overwrite None branchmerge True partial False 75 overwrite None branchmerge True partial False
76 ancestor ecf3cb2a4219 local f4db7e329e71 remote 924404dff337 76 ancestor ecf3cb2a4219 local f4db7e329e71 remote 924404dff337
77 b: local moved -> c 77 b: local moved -> m
78 rev: versions differ -> m 78 rev: versions differ -> m
79 merging b and a to b 79 merging b and a to b
80 resolving b 80 resolving b
81 my b@. other a@f4db7e329e71 ancestor a@924404dff337 81 my b@. other a@f4db7e329e71 ancestor a@924404dff337
82 merging rev 82 merging rev
94 -------------- 94 --------------
95 resolving manifests 95 resolving manifests
96 overwrite None branchmerge True partial False 96 overwrite None branchmerge True partial False
97 ancestor 94b33a1b7f2d local 735846fee2d7 remote 924404dff337 97 ancestor 94b33a1b7f2d local 735846fee2d7 remote 924404dff337
98 rev: versions differ -> m 98 rev: versions differ -> m
99 a: remote copied -> c 99 a: remote copied -> m
100 merging a and b to b 100 merging a and b to b
101 resolving a 101 resolving a
102 my a@. other b@735846fee2d7 ancestor a@924404dff337 102 my a@. other b@735846fee2d7 ancestor a@924404dff337
103 copying a to b 103 copying a to b
104 merging rev 104 merging rev
116 test L:nc a b R: W: - 6 nothing 116 test L:nc a b R: W: - 6 nothing
117 -------------- 117 --------------
118 resolving manifests 118 resolving manifests
119 overwrite None branchmerge True partial False 119 overwrite None branchmerge True partial False
120 ancestor ac809aeed39a local 97c705ade336 remote 924404dff337 120 ancestor ac809aeed39a local 97c705ade336 remote 924404dff337
121 b: local copied -> c 121 b: local copied -> m
122 rev: versions differ -> m 122 rev: versions differ -> m
123 merging b and a to b 123 merging b and a to b
124 resolving b 124 resolving b
125 my b@. other a@97c705ade336 ancestor a@924404dff337 125 my b@. other a@97c705ade336 ancestor a@924404dff337
126 merging rev 126 merging rev
138 test L: R:nm a b W: - 7 get b 138 test L: R:nm a b W: - 7 get b
139 -------------- 139 --------------
140 resolving manifests 140 resolving manifests
141 overwrite None branchmerge True partial False 141 overwrite None branchmerge True partial False
142 ancestor 94b33a1b7f2d local e03727d2d66b remote 924404dff337 142 ancestor 94b33a1b7f2d local e03727d2d66b remote 924404dff337
143 a: remote moved -> c 143 a: remote moved -> m
144 rev: versions differ -> m 144 rev: versions differ -> m
145 merging a and b to b 145 merging a and b to b
146 resolving a 146 resolving a
147 my a@. other b@e03727d2d66b ancestor a@924404dff337 147 my a@. other b@e03727d2d66b ancestor a@924404dff337
148 copying a to b 148 copying a to b
161 test L:nm a b R: W: - 8 nothing 161 test L:nm a b R: W: - 8 nothing
162 -------------- 162 --------------
163 resolving manifests 163 resolving manifests
164 overwrite None branchmerge True partial False 164 overwrite None branchmerge True partial False
165 ancestor ecf3cb2a4219 local 97c705ade336 remote 924404dff337 165 ancestor ecf3cb2a4219 local 97c705ade336 remote 924404dff337
166 b: local moved -> c 166 b: local moved -> m
167 rev: versions differ -> m 167 rev: versions differ -> m
168 merging b and a to b 168 merging b and a to b
169 resolving b 169 resolving b
170 my b@. other a@97c705ade336 ancestor a@924404dff337 170 my b@. other a@97c705ade336 ancestor a@924404dff337
171 merging rev 171 merging rev
397 test L:up a R:um a b W: - 20 merge a and b to b, remove a 397 test L:up a R:um a b W: - 20 merge a and b to b, remove a
398 -------------- 398 --------------
399 resolving manifests 399 resolving manifests
400 overwrite None branchmerge True partial False 400 overwrite None branchmerge True partial False
401 ancestor e300d1c794ec local 79cc6877a3b7 remote 924404dff337 401 ancestor e300d1c794ec local 79cc6877a3b7 remote 924404dff337
402 a: remote moved -> c 402 a: remote moved -> m
403 rev: versions differ -> m 403 rev: versions differ -> m
404 merging a and b to b 404 merging a and b to b
405 resolving a 405 resolving a
406 my a@. other b@79cc6877a3b7 ancestor a@924404dff337 406 my a@. other b@79cc6877a3b7 ancestor a@924404dff337
407 copying a to b 407 copying a to b
420 test L:um a b R:up a W: - 21 merge a and b to b 420 test L:um a b R:up a W: - 21 merge a and b to b
421 -------------- 421 --------------
422 resolving manifests 422 resolving manifests
423 overwrite None branchmerge True partial False 423 overwrite None branchmerge True partial False
424 ancestor ec03c2ca8642 local f4db7e329e71 remote 924404dff337 424 ancestor ec03c2ca8642 local f4db7e329e71 remote 924404dff337
425 b: local moved -> c 425 b: local moved -> m
426 rev: versions differ -> m 426 rev: versions differ -> m
427 merging b and a to b 427 merging b and a to b
428 resolving b 428 resolving b
429 my b@. other a@f4db7e329e71 ancestor a@924404dff337 429 my b@. other a@f4db7e329e71 ancestor a@924404dff337
430 merging rev 430 merging rev
441 test L:nm a b R:up a c W: - 23 get c, keep b 441 test L:nm a b R:up a c W: - 23 get c, keep b
442 -------------- 442 --------------
443 resolving manifests 443 resolving manifests
444 overwrite None branchmerge True partial False 444 overwrite None branchmerge True partial False
445 ancestor ecf3cb2a4219 local 2b958612230f remote 924404dff337 445 ancestor ecf3cb2a4219 local 2b958612230f remote 924404dff337
446 b: local moved -> c 446 b: local moved -> m
447 rev: versions differ -> m 447 rev: versions differ -> m
448 c: remote created -> g 448 c: remote created -> g
449 merging b and a to b 449 merging b and a to b
450 resolving b 450 resolving b
451 my b@. other a@2b958612230f ancestor a@924404dff337 451 my b@. other a@2b958612230f ancestor a@924404dff337