Mercurial > hg

comparison tests/test-rename-merge2.t @ 15625:efdcce3fd2d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: make debug output easier to read I always found it hard to figure out what the debug code meant without the separators.
author Martin Geisler <mg@aragost.com>
date Fri, 09 Dec 2011 17:34:53 +0100
parents ffb5c09ba822
children e9ae770eff1c
comparison
equal deleted inserted replaced
15624:be43234a6d60 15625:efdcce3fd2d5
82 b 82 b
83 all copies found (* = to merge, ! = divergent): 83 all copies found (* = to merge, ! = divergent):
84 b -> a * 84 b -> a *
85 checking for directory renames 85 checking for directory renames
86 resolving manifests 86 resolving manifests
87 overwrite None partial False 87 overwrite: False, partial: False
88 ancestor 924404dff337 local e300d1c794ec+ remote 4ce40f5aca24 88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
89 rev: versions differ -> m 89 rev: versions differ -> m
90 a: remote copied to b -> m 90 a: remote copied to b -> m
91 preserving a for resolve of b 91 preserving a for resolve of b
92 preserving rev for resolve of rev 92 preserving rev for resolve of rev
93 updating: a 1/2 files (50.00%) 93 updating: a 1/2 files (50.00%)
117 b 117 b
118 all copies found (* = to merge, ! = divergent): 118 all copies found (* = to merge, ! = divergent):
119 b -> a * 119 b -> a *
120 checking for directory renames 120 checking for directory renames
121 resolving manifests 121 resolving manifests
122 overwrite None partial False 122 overwrite: False, partial: False
123 ancestor 924404dff337 local 86a2aa42fc76+ remote f4db7e329e71 123 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71
124 a: remote is newer -> g 124 a: remote is newer -> g
125 b: local copied/moved to a -> m 125 b: local copied/moved to a -> m
126 rev: versions differ -> m 126 rev: versions differ -> m
127 preserving b for resolve of b 127 preserving b for resolve of b
128 preserving rev for resolve of rev 128 preserving rev for resolve of rev
155 b 155 b
156 all copies found (* = to merge, ! = divergent): 156 all copies found (* = to merge, ! = divergent):
157 b -> a * 157 b -> a *
158 checking for directory renames 158 checking for directory renames
159 resolving manifests 159 resolving manifests
160 overwrite None partial False 160 overwrite: False, partial: False
161 ancestor 924404dff337 local e300d1c794ec+ remote bdb19105162a 161 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a
162 rev: versions differ -> m 162 rev: versions differ -> m
163 a: remote moved to b -> m 163 a: remote moved to b -> m
164 preserving a for resolve of b 164 preserving a for resolve of b
165 preserving rev for resolve of rev 165 preserving rev for resolve of rev
166 removing a 166 removing a
190 b 190 b
191 all copies found (* = to merge, ! = divergent): 191 all copies found (* = to merge, ! = divergent):
192 b -> a * 192 b -> a *
193 checking for directory renames 193 checking for directory renames
194 resolving manifests 194 resolving manifests
195 overwrite None partial False 195 overwrite: False, partial: False
196 ancestor 924404dff337 local 02963e448370+ remote f4db7e329e71 196 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71
197 b: local copied/moved to a -> m 197 b: local copied/moved to a -> m
198 rev: versions differ -> m 198 rev: versions differ -> m
199 preserving b for resolve of b 199 preserving b for resolve of b
200 preserving rev for resolve of rev 200 preserving rev for resolve of rev
201 updating: b 1/2 files (50.00%) 201 updating: b 1/2 files (50.00%)
224 b 224 b
225 all copies found (* = to merge, ! = divergent): 225 all copies found (* = to merge, ! = divergent):
226 b -> a 226 b -> a
227 checking for directory renames 227 checking for directory renames
228 resolving manifests 228 resolving manifests
229 overwrite None partial False 229 overwrite: False, partial: False
230 ancestor 924404dff337 local 94b33a1b7f2d+ remote 4ce40f5aca24 230 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24
231 rev: versions differ -> m 231 rev: versions differ -> m
232 b: remote created -> g 232 b: remote created -> g
233 preserving rev for resolve of rev 233 preserving rev for resolve of rev
234 updating: b 1/2 files (50.00%) 234 updating: b 1/2 files (50.00%)
235 getting b 235 getting b
254 b 254 b
255 all copies found (* = to merge, ! = divergent): 255 all copies found (* = to merge, ! = divergent):
256 b -> a 256 b -> a
257 checking for directory renames 257 checking for directory renames
258 resolving manifests 258 resolving manifests
259 overwrite None partial False 259 overwrite: False, partial: False
260 ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336 260 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
261 rev: versions differ -> m 261 rev: versions differ -> m
262 preserving rev for resolve of rev 262 preserving rev for resolve of rev
263 updating: rev 1/1 files (100.00%) 263 updating: rev 1/1 files (100.00%)
264 picked tool 'python ../merge' for rev (binary False symlink False) 264 picked tool 'python ../merge' for rev (binary False symlink False)
265 merging rev 265 merging rev
281 b 281 b
282 all copies found (* = to merge, ! = divergent): 282 all copies found (* = to merge, ! = divergent):
283 b -> a 283 b -> a
284 checking for directory renames 284 checking for directory renames
285 resolving manifests 285 resolving manifests
286 overwrite None partial False 286 overwrite: False, partial: False
287 ancestor 924404dff337 local 94b33a1b7f2d+ remote bdb19105162a 287 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a
288 a: other deleted -> r 288 a: other deleted -> r
289 rev: versions differ -> m 289 rev: versions differ -> m
290 b: remote created -> g 290 b: remote created -> g
291 preserving rev for resolve of rev 291 preserving rev for resolve of rev
292 updating: a 1/3 files (33.33%) 292 updating: a 1/3 files (33.33%)
313 b 313 b
314 all copies found (* = to merge, ! = divergent): 314 all copies found (* = to merge, ! = divergent):
315 b -> a 315 b -> a
316 checking for directory renames 316 checking for directory renames
317 resolving manifests 317 resolving manifests
318 overwrite None partial False 318 overwrite: False, partial: False
319 ancestor 924404dff337 local 02963e448370+ remote 97c705ade336 319 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
320 rev: versions differ -> m 320 rev: versions differ -> m
321 preserving rev for resolve of rev 321 preserving rev for resolve of rev
322 updating: rev 1/1 files (100.00%) 322 updating: rev 1/1 files (100.00%)
323 picked tool 'python ../merge' for rev (binary False symlink False) 323 picked tool 'python ../merge' for rev (binary False symlink False)
324 merging rev 324 merging rev
334 -------------- 334 --------------
335 test L:um a b R:um a b W: - 9 do merge with ancestor in a 335 test L:um a b R:um a b W: - 9 do merge with ancestor in a
336 -------------- 336 --------------
337 searching for copies back to rev 1 337 searching for copies back to rev 1
338 resolving manifests 338 resolving manifests
339 overwrite None partial False 339 overwrite: False, partial: False
340 ancestor 924404dff337 local 62e7bf090eba+ remote 49b6d8032493 340 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493
341 b: versions differ -> m 341 b: versions differ -> m
342 rev: versions differ -> m 342 rev: versions differ -> m
343 preserving b for resolve of b 343 preserving b for resolve of b
344 preserving rev for resolve of rev 344 preserving rev for resolve of rev
345 updating: b 1/2 files (50.00%) 345 updating: b 1/2 files (50.00%)
373 c -> a ! 373 c -> a !
374 b -> a ! 374 b -> a !
375 checking for directory renames 375 checking for directory renames
376 a: divergent renames -> dr 376 a: divergent renames -> dr
377 resolving manifests 377 resolving manifests
378 overwrite None partial False 378 overwrite: False, partial: False
379 ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e 379 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e
380 rev: versions differ -> m 380 rev: versions differ -> m
381 c: remote created -> g 381 c: remote created -> g
382 preserving rev for resolve of rev 382 preserving rev for resolve of rev
383 updating: a 1/3 files (33.33%) 383 updating: a 1/3 files (33.33%)
384 note: possible conflict - a was renamed multiple times to: 384 note: possible conflict - a was renamed multiple times to:
402 -------------- 402 --------------
403 test L:nc a b R:up b W: - 12 merge b no ancestor 403 test L:nc a b R:up b W: - 12 merge b no ancestor
404 -------------- 404 --------------
405 searching for copies back to rev 1 405 searching for copies back to rev 1
406 resolving manifests 406 resolving manifests
407 overwrite None partial False 407 overwrite: False, partial: False
408 ancestor 924404dff337 local 86a2aa42fc76+ remote af30c7647fc7 408 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
409 b: versions differ -> m 409 b: versions differ -> m
410 rev: versions differ -> m 410 rev: versions differ -> m
411 preserving b for resolve of b 411 preserving b for resolve of b
412 preserving rev for resolve of rev 412 preserving rev for resolve of rev
413 updating: b 1/2 files (50.00%) 413 updating: b 1/2 files (50.00%)
430 -------------- 430 --------------
431 test L:up b R:nm a b W: - 13 merge b no ancestor 431 test L:up b R:nm a b W: - 13 merge b no ancestor
432 -------------- 432 --------------
433 searching for copies back to rev 1 433 searching for copies back to rev 1
434 resolving manifests 434 resolving manifests
435 overwrite None partial False 435 overwrite: False, partial: False
436 ancestor 924404dff337 local 59318016310c+ remote bdb19105162a 436 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
437 a: other deleted -> r 437 a: other deleted -> r
438 b: versions differ -> m 438 b: versions differ -> m
439 rev: versions differ -> m 439 rev: versions differ -> m
440 preserving b for resolve of b 440 preserving b for resolve of b
441 preserving rev for resolve of rev 441 preserving rev for resolve of rev
460 -------------- 460 --------------
461 test L:nc a b R:up a b W: - 14 merge b no ancestor 461 test L:nc a b R:up a b W: - 14 merge b no ancestor
462 -------------- 462 --------------
463 searching for copies back to rev 1 463 searching for copies back to rev 1
464 resolving manifests 464 resolving manifests
465 overwrite None partial False 465 overwrite: False, partial: False
466 ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a 466 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
467 a: remote is newer -> g 467 a: remote is newer -> g
468 b: versions differ -> m 468 b: versions differ -> m
469 rev: versions differ -> m 469 rev: versions differ -> m
470 preserving b for resolve of b 470 preserving b for resolve of b
471 preserving rev for resolve of rev 471 preserving rev for resolve of rev
491 -------------- 491 --------------
492 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a 492 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
493 -------------- 493 --------------
494 searching for copies back to rev 1 494 searching for copies back to rev 1
495 resolving manifests 495 resolving manifests
496 overwrite None partial False 496 overwrite: False, partial: False
497 ancestor 924404dff337 local 59318016310c+ remote bdb19105162a 497 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
498 a: other deleted -> r 498 a: other deleted -> r
499 b: versions differ -> m 499 b: versions differ -> m
500 rev: versions differ -> m 500 rev: versions differ -> m
501 preserving b for resolve of b 501 preserving b for resolve of b
502 preserving rev for resolve of rev 502 preserving rev for resolve of rev
521 -------------- 521 --------------
522 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor 522 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
523 -------------- 523 --------------
524 searching for copies back to rev 1 524 searching for copies back to rev 1
525 resolving manifests 525 resolving manifests
526 overwrite None partial False 526 overwrite: False, partial: False
527 ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a 527 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
528 a: remote is newer -> g 528 a: remote is newer -> g
529 b: versions differ -> m 529 b: versions differ -> m
530 rev: versions differ -> m 530 rev: versions differ -> m
531 preserving b for resolve of b 531 preserving b for resolve of b
532 preserving rev for resolve of rev 532 preserving rev for resolve of rev
552 -------------- 552 --------------
553 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor 553 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
554 -------------- 554 --------------
555 searching for copies back to rev 1 555 searching for copies back to rev 1
556 resolving manifests 556 resolving manifests
557 overwrite None partial False 557 overwrite: False, partial: False
558 ancestor 924404dff337 local 0b76e65c8289+ remote 4ce40f5aca24 558 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
559 b: versions differ -> m 559 b: versions differ -> m
560 rev: versions differ -> m 560 rev: versions differ -> m
561 preserving b for resolve of b 561 preserving b for resolve of b
562 preserving rev for resolve of rev 562 preserving rev for resolve of rev
563 updating: b 1/2 files (50.00%) 563 updating: b 1/2 files (50.00%)
580 -------------- 580 --------------
581 test L:nm a b R:up a b W: - 18 merge b no ancestor 581 test L:nm a b R:up a b W: - 18 merge b no ancestor
582 -------------- 582 --------------
583 searching for copies back to rev 1 583 searching for copies back to rev 1
584 resolving manifests 584 resolving manifests
585 overwrite None partial False 585 overwrite: False, partial: False
586 ancestor 924404dff337 local 02963e448370+ remote 8dbce441892a 586 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
587 b: versions differ -> m 587 b: versions differ -> m
588 rev: versions differ -> m 588 rev: versions differ -> m
589 remote changed a which local deleted 589 remote changed a which local deleted
590 use (c)hanged version or leave (d)eleted? c 590 use (c)hanged version or leave (d)eleted? c
591 a: prompt recreating -> g 591 a: prompt recreating -> g
613 -------------- 613 --------------
614 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a 614 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
615 -------------- 615 --------------
616 searching for copies back to rev 1 616 searching for copies back to rev 1
617 resolving manifests 617 resolving manifests
618 overwrite None partial False 618 overwrite: False, partial: False
619 ancestor 924404dff337 local 0b76e65c8289+ remote bdb19105162a 619 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
620 local changed a which remote deleted 620 local changed a which remote deleted
621 use (c)hanged version or (d)elete? c 621 use (c)hanged version or (d)elete? c
622 a: prompt keep -> a 622 a: prompt keep -> a
623 b: versions differ -> m 623 b: versions differ -> m
624 rev: versions differ -> m 624 rev: versions differ -> m
650 b 650 b
651 all copies found (* = to merge, ! = divergent): 651 all copies found (* = to merge, ! = divergent):
652 b -> a * 652 b -> a *
653 checking for directory renames 653 checking for directory renames
654 resolving manifests 654 resolving manifests
655 overwrite None partial False 655 overwrite: False, partial: False
656 ancestor 924404dff337 local e300d1c794ec+ remote 49b6d8032493 656 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493
657 rev: versions differ -> m 657 rev: versions differ -> m
658 a: remote moved to b -> m 658 a: remote moved to b -> m
659 preserving a for resolve of b 659 preserving a for resolve of b
660 preserving rev for resolve of rev 660 preserving rev for resolve of rev
661 removing a 661 removing a
684 b 684 b
685 all copies found (* = to merge, ! = divergent): 685 all copies found (* = to merge, ! = divergent):
686 b -> a * 686 b -> a *
687 checking for directory renames 687 checking for directory renames
688 resolving manifests 688 resolving manifests
689 overwrite None partial False 689 overwrite: False, partial: False
690 ancestor 924404dff337 local 62e7bf090eba+ remote f4db7e329e71 690 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
691 b: local copied/moved to a -> m 691 b: local copied/moved to a -> m
692 rev: versions differ -> m 692 rev: versions differ -> m
693 preserving b for resolve of b 693 preserving b for resolve of b
694 preserving rev for resolve of rev 694 preserving rev for resolve of rev
695 updating: b 1/2 files (50.00%) 695 updating: b 1/2 files (50.00%)
722 c 722 c
723 all copies found (* = to merge, ! = divergent): 723 all copies found (* = to merge, ! = divergent):
724 b -> a * 724 b -> a *
725 checking for directory renames 725 checking for directory renames
726 resolving manifests 726 resolving manifests
727 overwrite None partial False 727 overwrite: False, partial: False
728 ancestor 924404dff337 local 02963e448370+ remote 2b958612230f 728 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f
729 b: local copied/moved to a -> m 729 b: local copied/moved to a -> m
730 rev: versions differ -> m 730 rev: versions differ -> m
731 c: remote created -> g 731 c: remote created -> g
732 preserving b for resolve of b 732 preserving b for resolve of b
733 preserving rev for resolve of rev 733 preserving rev for resolve of rev