equal
deleted
inserted
replaced
2 test L:up a R:nc a b W: - 1 get local a to b |
2 test L:up a R:nc a b W: - 1 get local a to b |
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 searching for copies back to rev 1 |
|
8 unmatched files in other: |
|
9 b |
|
10 all copies found (* = to merge, ! = divergent): |
|
11 b -> a * |
|
12 checking for directory renames |
7 rev: versions differ -> m |
13 rev: versions differ -> m |
8 a: remote copied to b -> m |
14 a: remote copied to b -> m |
9 copying a to b |
15 copying a to b |
10 merging a and b |
16 merging a and b |
11 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 |
17 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 |
23 test L:nc a b R:up a W: - 2 get rem change to a and b |
29 test L:nc a b R:up a W: - 2 get rem change to a and b |
24 -------------- |
30 -------------- |
25 resolving manifests |
31 resolving manifests |
26 overwrite None partial False |
32 overwrite None partial False |
27 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71 |
33 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71 |
|
34 searching for copies back to rev 1 |
|
35 unmatched files in local: |
|
36 b |
|
37 all copies found (* = to merge, ! = divergent): |
|
38 b -> a * |
|
39 checking for directory renames |
28 a: remote is newer -> g |
40 a: remote is newer -> g |
29 b: local copied to a -> m |
41 b: local copied to a -> m |
30 rev: versions differ -> m |
42 rev: versions differ -> m |
31 getting a |
43 getting a |
32 merging b and a |
44 merging b and a |
45 test L:up a R:nm a b W: - 3 get local a change to b, remove a |
57 test L:up a R:nm a b W: - 3 get local a change to b, remove a |
46 -------------- |
58 -------------- |
47 resolving manifests |
59 resolving manifests |
48 overwrite None partial False |
60 overwrite None partial False |
49 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b |
61 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b |
|
62 searching for copies back to rev 1 |
|
63 unmatched files in other: |
|
64 b |
|
65 all copies found (* = to merge, ! = divergent): |
|
66 b -> a * |
|
67 checking for directory renames |
50 rev: versions differ -> m |
68 rev: versions differ -> m |
51 a: remote moved to b -> m |
69 a: remote moved to b -> m |
52 copying a to b |
70 copying a to b |
53 merging a and b |
71 merging a and b |
54 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 |
72 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 |
66 test L:nm a b R:up a W: - 4 get remote change to b |
84 test L:nm a b R:up a W: - 4 get remote change to b |
67 -------------- |
85 -------------- |
68 resolving manifests |
86 resolving manifests |
69 overwrite None partial False |
87 overwrite None partial False |
70 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71 |
88 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71 |
|
89 searching for copies back to rev 1 |
|
90 unmatched files in local: |
|
91 b |
|
92 all copies found (* = to merge, ! = divergent): |
|
93 b -> a * |
|
94 checking for directory renames |
71 b: local moved to a -> m |
95 b: local moved to a -> m |
72 rev: versions differ -> m |
96 rev: versions differ -> m |
73 merging b and a |
97 merging b and a |
74 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 |
98 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 |
75 merging rev |
99 merging rev |
85 test L: R:nc a b W: - 5 get b |
109 test L: R:nc a b W: - 5 get b |
86 -------------- |
110 -------------- |
87 resolving manifests |
111 resolving manifests |
88 overwrite None partial False |
112 overwrite None partial False |
89 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7 |
113 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7 |
|
114 searching for copies back to rev 1 |
|
115 unmatched files in other: |
|
116 b |
|
117 all copies found (* = to merge, ! = divergent): |
|
118 b -> a |
|
119 checking for directory renames |
90 rev: versions differ -> m |
120 rev: versions differ -> m |
91 b: remote created -> g |
121 b: remote created -> g |
92 getting b |
122 getting b |
93 merging rev |
123 merging rev |
94 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 |
124 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 |
103 test L:nc a b R: W: - 6 nothing |
133 test L:nc a b R: W: - 6 nothing |
104 -------------- |
134 -------------- |
105 resolving manifests |
135 resolving manifests |
106 overwrite None partial False |
136 overwrite None partial False |
107 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336 |
137 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336 |
|
138 searching for copies back to rev 1 |
|
139 unmatched files in local: |
|
140 b |
|
141 all copies found (* = to merge, ! = divergent): |
|
142 b -> a |
|
143 checking for directory renames |
108 rev: versions differ -> m |
144 rev: versions differ -> m |
109 merging rev |
145 merging rev |
110 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 |
146 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 |
111 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
147 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
112 (branch merge, don't forget to commit) |
148 (branch merge, don't forget to commit) |
119 test L: R:nm a b W: - 7 get b |
155 test L: R:nm a b W: - 7 get b |
120 -------------- |
156 -------------- |
121 resolving manifests |
157 resolving manifests |
122 overwrite None partial False |
158 overwrite None partial False |
123 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b |
159 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b |
|
160 searching for copies back to rev 1 |
|
161 unmatched files in other: |
|
162 b |
|
163 all copies found (* = to merge, ! = divergent): |
|
164 b -> a |
|
165 checking for directory renames |
124 a: other deleted -> r |
166 a: other deleted -> r |
125 rev: versions differ -> m |
167 rev: versions differ -> m |
126 b: remote created -> g |
168 b: remote created -> g |
127 removing a |
169 removing a |
128 getting b |
170 getting b |
138 test L:nm a b R: W: - 8 nothing |
180 test L:nm a b R: W: - 8 nothing |
139 -------------- |
181 -------------- |
140 resolving manifests |
182 resolving manifests |
141 overwrite None partial False |
183 overwrite None partial False |
142 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336 |
184 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336 |
|
185 searching for copies back to rev 1 |
|
186 unmatched files in local: |
|
187 b |
|
188 all copies found (* = to merge, ! = divergent): |
|
189 b -> a |
|
190 checking for directory renames |
143 rev: versions differ -> m |
191 rev: versions differ -> m |
144 merging rev |
192 merging rev |
145 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 |
193 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 |
146 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
194 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
147 (branch merge, don't forget to commit) |
195 (branch merge, don't forget to commit) |
153 test L:um a b R:um a b W: - 9 do merge with ancestor in a |
201 test L:um a b R:um a b W: - 9 do merge with ancestor in a |
154 -------------- |
202 -------------- |
155 resolving manifests |
203 resolving manifests |
156 overwrite None partial False |
204 overwrite None partial False |
157 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7 |
205 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7 |
|
206 searching for copies back to rev 1 |
158 b: versions differ -> m |
207 b: versions differ -> m |
159 rev: versions differ -> m |
208 rev: versions differ -> m |
160 merging b |
209 merging b |
161 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337 |
210 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337 |
162 merging rev |
211 merging rev |
171 test L:nm a b R:nm a c W: - 11 get c, keep b |
220 test L:nm a b R:nm a c W: - 11 get c, keep b |
172 -------------- |
221 -------------- |
173 resolving manifests |
222 resolving manifests |
174 overwrite None partial False |
223 overwrite None partial False |
175 ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2 |
224 ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2 |
|
225 searching for copies back to rev 1 |
|
226 unmatched files in local: |
|
227 b |
|
228 unmatched files in other: |
|
229 c |
|
230 all copies found (* = to merge, ! = divergent): |
|
231 c -> a |
|
232 b -> a |
|
233 checking for directory renames |
176 a: divergent renames -> dr |
234 a: divergent renames -> dr |
177 rev: versions differ -> m |
235 rev: versions differ -> m |
178 c: remote created -> g |
236 c: remote created -> g |
179 warning: detected divergent renames of a to: |
237 warning: detected divergent renames of a to: |
180 b |
238 b |
193 test L:nc a b R:up b W: - 12 merge b no ancestor |
251 test L:nc a b R:up b W: - 12 merge b no ancestor |
194 -------------- |
252 -------------- |
195 resolving manifests |
253 resolving manifests |
196 overwrite None partial False |
254 overwrite None partial False |
197 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7 |
255 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7 |
|
256 searching for copies back to rev 1 |
198 b: versions differ -> m |
257 b: versions differ -> m |
199 rev: versions differ -> m |
258 rev: versions differ -> m |
200 merging b |
259 merging b |
201 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000 |
260 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000 |
202 merging rev |
261 merging rev |
212 test L:up b R:nm a b W: - 13 merge b no ancestor |
271 test L:up b R:nm a b W: - 13 merge b no ancestor |
213 -------------- |
272 -------------- |
214 resolving manifests |
273 resolving manifests |
215 overwrite None partial False |
274 overwrite None partial False |
216 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b |
275 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b |
|
276 searching for copies back to rev 1 |
217 a: other deleted -> r |
277 a: other deleted -> r |
218 b: versions differ -> m |
278 b: versions differ -> m |
219 rev: versions differ -> m |
279 rev: versions differ -> m |
220 removing a |
280 removing a |
221 merging b |
281 merging b |
232 test L:nc a b R:up a b W: - 14 merge b no ancestor |
292 test L:nc a b R:up a b W: - 14 merge b no ancestor |
233 -------------- |
293 -------------- |
234 resolving manifests |
294 resolving manifests |
235 overwrite None partial False |
295 overwrite None partial False |
236 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a |
296 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a |
|
297 searching for copies back to rev 1 |
237 a: remote is newer -> g |
298 a: remote is newer -> g |
238 b: versions differ -> m |
299 b: versions differ -> m |
239 rev: versions differ -> m |
300 rev: versions differ -> m |
240 getting a |
301 getting a |
241 merging b |
302 merging b |
253 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a |
314 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a |
254 -------------- |
315 -------------- |
255 resolving manifests |
316 resolving manifests |
256 overwrite None partial False |
317 overwrite None partial False |
257 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b |
318 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b |
|
319 searching for copies back to rev 1 |
258 a: other deleted -> r |
320 a: other deleted -> r |
259 b: versions differ -> m |
321 b: versions differ -> m |
260 rev: versions differ -> m |
322 rev: versions differ -> m |
261 removing a |
323 removing a |
262 merging b |
324 merging b |
273 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
335 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
274 -------------- |
336 -------------- |
275 resolving manifests |
337 resolving manifests |
276 overwrite None partial False |
338 overwrite None partial False |
277 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a |
339 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a |
|
340 searching for copies back to rev 1 |
278 a: remote is newer -> g |
341 a: remote is newer -> g |
279 b: versions differ -> m |
342 b: versions differ -> m |
280 rev: versions differ -> m |
343 rev: versions differ -> m |
281 getting a |
344 getting a |
282 merging b |
345 merging b |
294 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
357 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
295 -------------- |
358 -------------- |
296 resolving manifests |
359 resolving manifests |
297 overwrite None partial False |
360 overwrite None partial False |
298 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7 |
361 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7 |
|
362 searching for copies back to rev 1 |
299 b: versions differ -> m |
363 b: versions differ -> m |
300 rev: versions differ -> m |
364 rev: versions differ -> m |
301 merging b |
365 merging b |
302 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000 |
366 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000 |
303 merging rev |
367 merging rev |
313 test L:nm a b R:up a b W: - 18 merge b no ancestor |
377 test L:nm a b R:up a b W: - 18 merge b no ancestor |
314 -------------- |
378 -------------- |
315 resolving manifests |
379 resolving manifests |
316 overwrite None partial False |
380 overwrite None partial False |
317 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a |
381 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a |
|
382 searching for copies back to rev 1 |
318 b: versions differ -> m |
383 b: versions differ -> m |
319 rev: versions differ -> m |
384 rev: versions differ -> m |
320 a: prompt recreating -> g |
385 a: prompt recreating -> g |
321 getting a |
386 getting a |
322 merging b |
387 merging b |
334 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
399 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
335 -------------- |
400 -------------- |
336 resolving manifests |
401 resolving manifests |
337 overwrite None partial False |
402 overwrite None partial False |
338 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b |
403 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b |
|
404 searching for copies back to rev 1 |
339 b: versions differ -> m |
405 b: versions differ -> m |
340 rev: versions differ -> m |
406 rev: versions differ -> m |
341 merging b |
407 merging b |
342 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000 |
408 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000 |
343 merging rev |
409 merging rev |
353 test L:up a R:um a b W: - 20 merge a and b to b, remove a |
419 test L:up a R:um a b W: - 20 merge a and b to b, remove a |
354 -------------- |
420 -------------- |
355 resolving manifests |
421 resolving manifests |
356 overwrite None partial False |
422 overwrite None partial False |
357 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 |
423 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7 |
|
424 searching for copies back to rev 1 |
|
425 unmatched files in other: |
|
426 b |
|
427 all copies found (* = to merge, ! = divergent): |
|
428 b -> a * |
|
429 checking for directory renames |
358 rev: versions differ -> m |
430 rev: versions differ -> m |
359 a: remote moved to b -> m |
431 a: remote moved to b -> m |
360 copying a to b |
432 copying a to b |
361 merging a and b |
433 merging a and b |
362 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 |
434 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 |
374 test L:um a b R:up a W: - 21 merge a and b to b |
446 test L:um a b R:up a W: - 21 merge a and b to b |
375 -------------- |
447 -------------- |
376 resolving manifests |
448 resolving manifests |
377 overwrite None partial False |
449 overwrite None partial False |
378 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71 |
450 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71 |
|
451 searching for copies back to rev 1 |
|
452 unmatched files in local: |
|
453 b |
|
454 all copies found (* = to merge, ! = divergent): |
|
455 b -> a * |
|
456 checking for directory renames |
379 b: local moved to a -> m |
457 b: local moved to a -> m |
380 rev: versions differ -> m |
458 rev: versions differ -> m |
381 merging b and a |
459 merging b and a |
382 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 |
460 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 |
383 merging rev |
461 merging rev |
393 test L:nm a b R:up a c W: - 23 get c, keep b |
471 test L:nm a b R:up a c W: - 23 get c, keep b |
394 -------------- |
472 -------------- |
395 resolving manifests |
473 resolving manifests |
396 overwrite None partial False |
474 overwrite None partial False |
397 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f |
475 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f |
|
476 searching for copies back to rev 1 |
|
477 unmatched files in local: |
|
478 b |
|
479 unmatched files in other: |
|
480 c |
|
481 all copies found (* = to merge, ! = divergent): |
|
482 b -> a * |
|
483 checking for directory renames |
398 b: local moved to a -> m |
484 b: local moved to a -> m |
399 rev: versions differ -> m |
485 rev: versions differ -> m |
400 c: remote created -> g |
486 c: remote created -> g |
401 merging b and a |
487 merging b and a |
402 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 |
488 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 |