Mercurial > hg

comparison tests/test-rename-merge2.t @ 20641:3db9e798e004

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: when both sides made the same copy, report it as a copy Not used yet ... but shows up in debug output.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 25 Feb 2014 20:29:14 +0100
parents 73a3a2386654
children 18adc15635a1
comparison
equal deleted inserted replaced
20640:52929dcdd512 20641:3db9e798e004
333 created new head 333 created new head
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 unmatched files new in both:
339 b
338 resolving manifests 340 resolving manifests
339 branchmerge: True, force: False, partial: False 341 branchmerge: True, force: False, partial: False
340 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 342 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493
341 b: versions differ -> m 343 b: versions differ -> m
342 preserving b for resolve of b 344 preserving b for resolve of b
401 created new head 403 created new head
402 -------------- 404 --------------
403 test L:nc a b R:up b W: - 12 merge b no ancestor 405 test L:nc a b R:up b W: - 12 merge b no ancestor
404 -------------- 406 --------------
405 searching for copies back to rev 1 407 searching for copies back to rev 1
408 unmatched files new in both:
409 b
406 resolving manifests 410 resolving manifests
407 branchmerge: True, force: False, partial: False 411 branchmerge: True, force: False, partial: False
408 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 412 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
409 b: versions differ -> m 413 b: versions differ -> m
410 preserving b for resolve of b 414 preserving b for resolve of b
429 created new head 433 created new head
430 -------------- 434 --------------
431 test L:up b R:nm a b W: - 13 merge b no ancestor 435 test L:up b R:nm a b W: - 13 merge b no ancestor
432 -------------- 436 --------------
433 searching for copies back to rev 1 437 searching for copies back to rev 1
438 unmatched files new in both:
439 b
434 resolving manifests 440 resolving manifests
435 branchmerge: True, force: False, partial: False 441 branchmerge: True, force: False, partial: False
436 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a 442 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
437 a: other deleted -> r 443 a: other deleted -> r
438 b: versions differ -> m 444 b: versions differ -> m
459 created new head 465 created new head
460 -------------- 466 --------------
461 test L:nc a b R:up a b W: - 14 merge b no ancestor 467 test L:nc a b R:up a b W: - 14 merge b no ancestor
462 -------------- 468 --------------
463 searching for copies back to rev 1 469 searching for copies back to rev 1
470 unmatched files new in both:
471 b
464 resolving manifests 472 resolving manifests
465 branchmerge: True, force: False, partial: False 473 branchmerge: True, force: False, partial: False
466 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a 474 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
467 a: remote is newer -> g 475 a: remote is newer -> g
468 b: versions differ -> m 476 b: versions differ -> m
490 created new head 498 created new head
491 -------------- 499 --------------
492 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a 500 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
493 -------------- 501 --------------
494 searching for copies back to rev 1 502 searching for copies back to rev 1
503 unmatched files new in both:
504 b
495 resolving manifests 505 resolving manifests
496 branchmerge: True, force: False, partial: False 506 branchmerge: True, force: False, partial: False
497 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a 507 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
498 a: other deleted -> r 508 a: other deleted -> r
499 b: versions differ -> m 509 b: versions differ -> m
520 created new head 530 created new head
521 -------------- 531 --------------
522 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor 532 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
523 -------------- 533 --------------
524 searching for copies back to rev 1 534 searching for copies back to rev 1
535 unmatched files new in both:
536 b
525 resolving manifests 537 resolving manifests
526 branchmerge: True, force: False, partial: False 538 branchmerge: True, force: False, partial: False
527 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a 539 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
528 a: remote is newer -> g 540 a: remote is newer -> g
529 b: versions differ -> m 541 b: versions differ -> m
551 created new head 563 created new head
552 -------------- 564 --------------
553 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor 565 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
554 -------------- 566 --------------
555 searching for copies back to rev 1 567 searching for copies back to rev 1
568 unmatched files new in both:
569 b
556 resolving manifests 570 resolving manifests
557 branchmerge: True, force: False, partial: False 571 branchmerge: True, force: False, partial: False
558 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 572 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
559 b: versions differ -> m 573 b: versions differ -> m
560 preserving b for resolve of b 574 preserving b for resolve of b
579 created new head 593 created new head
580 -------------- 594 --------------
581 test L:nm a b R:up a b W: - 18 merge b no ancestor 595 test L:nm a b R:up a b W: - 18 merge b no ancestor
582 -------------- 596 --------------
583 searching for copies back to rev 1 597 searching for copies back to rev 1
598 unmatched files new in both:
599 b
584 resolving manifests 600 resolving manifests
585 branchmerge: True, force: False, partial: False 601 branchmerge: True, force: False, partial: False
586 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a 602 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
587 remote changed a which local deleted 603 remote changed a which local deleted
588 use (c)hanged version or leave (d)eleted? c 604 use (c)hanged version or leave (d)eleted? c
612 created new head 628 created new head
613 -------------- 629 --------------
614 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a 630 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
615 -------------- 631 --------------
616 searching for copies back to rev 1 632 searching for copies back to rev 1
633 unmatched files new in both:
634 b
617 resolving manifests 635 resolving manifests
618 branchmerge: True, force: False, partial: False 636 branchmerge: True, force: False, partial: False
619 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a 637 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
620 local changed a which remote deleted 638 local changed a which remote deleted
621 use (c)hanged version or (d)elete? c 639 use (c)hanged version or (d)elete? c
800 6/g 818 6/g
801 unmatched files in other: 819 unmatched files in other:
802 3/g 820 3/g
803 4/g 821 4/g
804 7/f 822 7/f
823 unmatched files new in both:
824 0/f
825 1/g
805 all copies found (* = to merge, ! = divergent, % = renamed and deleted): 826 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
806 src: '3/f' -> dst: '3/g' * 827 src: '3/f' -> dst: '3/g' *
807 src: '4/f' -> dst: '4/g' * 828 src: '4/f' -> dst: '4/g' *
808 src: '5/f' -> dst: '5/g' * 829 src: '5/f' -> dst: '5/g' *
809 src: '6/f' -> dst: '6/g' * 830 src: '6/f' -> dst: '6/g' *