equal
deleted
inserted
replaced
352 $ tm "um a b" "um a b" " " "9 do merge with ancestor in a" |
352 $ tm "um a b" "um a b" " " "9 do merge with ancestor in a" |
353 created new head |
353 created new head |
354 -------------- |
354 -------------- |
355 test L:um a b R:um a b W: - 9 do merge with ancestor in a |
355 test L:um a b R:um a b W: - 9 do merge with ancestor in a |
356 -------------- |
356 -------------- |
357 unmatched files new in both: |
|
358 b |
|
359 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
357 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
360 src: 'a' -> dst: 'b' * |
358 src: 'a' -> dst: 'b' * |
361 checking for directory renames |
359 checking for directory renames |
362 resolving manifests |
360 resolving manifests |
363 branchmerge: True, force: False, partial: False |
361 branchmerge: True, force: False, partial: False |
433 $ tm "nc a b" "up b " " " "12 merge b no ancestor" |
431 $ tm "nc a b" "up b " " " "12 merge b no ancestor" |
434 created new head |
432 created new head |
435 -------------- |
433 -------------- |
436 test L:nc a b R:up b W: - 12 merge b no ancestor |
434 test L:nc a b R:up b W: - 12 merge b no ancestor |
437 -------------- |
435 -------------- |
438 unmatched files new in both: |
|
439 b |
|
440 resolving manifests |
436 resolving manifests |
441 branchmerge: True, force: False, partial: False |
437 branchmerge: True, force: False, partial: False |
442 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
438 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
443 preserving b for resolve of b |
439 preserving b for resolve of b |
444 preserving rev for resolve of rev |
440 preserving rev for resolve of rev |
471 $ tm "up b " "nm a b" " " "13 merge b no ancestor" |
467 $ tm "up b " "nm a b" " " "13 merge b no ancestor" |
472 created new head |
468 created new head |
473 -------------- |
469 -------------- |
474 test L:up b R:nm a b W: - 13 merge b no ancestor |
470 test L:up b R:nm a b W: - 13 merge b no ancestor |
475 -------------- |
471 -------------- |
476 unmatched files new in both: |
|
477 b |
|
478 resolving manifests |
472 resolving manifests |
479 branchmerge: True, force: False, partial: False |
473 branchmerge: True, force: False, partial: False |
480 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
474 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
481 preserving b for resolve of b |
475 preserving b for resolve of b |
482 preserving rev for resolve of rev |
476 preserving rev for resolve of rev |
510 $ tm "nc a b" "up a b" " " "14 merge b no ancestor" |
504 $ tm "nc a b" "up a b" " " "14 merge b no ancestor" |
511 created new head |
505 created new head |
512 -------------- |
506 -------------- |
513 test L:nc a b R:up a b W: - 14 merge b no ancestor |
507 test L:nc a b R:up a b W: - 14 merge b no ancestor |
514 -------------- |
508 -------------- |
515 unmatched files new in both: |
|
516 b |
|
517 resolving manifests |
509 resolving manifests |
518 branchmerge: True, force: False, partial: False |
510 branchmerge: True, force: False, partial: False |
519 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
511 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
520 preserving b for resolve of b |
512 preserving b for resolve of b |
521 preserving rev for resolve of rev |
513 preserving rev for resolve of rev |
549 $ tm "up b " "nm a b" " " "15 merge b no ancestor, remove a" |
541 $ tm "up b " "nm a b" " " "15 merge b no ancestor, remove a" |
550 created new head |
542 created new head |
551 -------------- |
543 -------------- |
552 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a |
544 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a |
553 -------------- |
545 -------------- |
554 unmatched files new in both: |
|
555 b |
|
556 resolving manifests |
546 resolving manifests |
557 branchmerge: True, force: False, partial: False |
547 branchmerge: True, force: False, partial: False |
558 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
548 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
559 preserving b for resolve of b |
549 preserving b for resolve of b |
560 preserving rev for resolve of rev |
550 preserving rev for resolve of rev |
588 $ tm "nc a b" "up a b" " " "16 get a, merge b no ancestor" |
578 $ tm "nc a b" "up a b" " " "16 get a, merge b no ancestor" |
589 created new head |
579 created new head |
590 -------------- |
580 -------------- |
591 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
581 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
592 -------------- |
582 -------------- |
593 unmatched files new in both: |
|
594 b |
|
595 resolving manifests |
583 resolving manifests |
596 branchmerge: True, force: False, partial: False |
584 branchmerge: True, force: False, partial: False |
597 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
585 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
598 preserving b for resolve of b |
586 preserving b for resolve of b |
599 preserving rev for resolve of rev |
587 preserving rev for resolve of rev |
627 $ tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor" |
615 $ tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor" |
628 created new head |
616 created new head |
629 -------------- |
617 -------------- |
630 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
618 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
631 -------------- |
619 -------------- |
632 unmatched files new in both: |
|
633 b |
|
634 resolving manifests |
620 resolving manifests |
635 branchmerge: True, force: False, partial: False |
621 branchmerge: True, force: False, partial: False |
636 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
622 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
637 preserving b for resolve of b |
623 preserving b for resolve of b |
638 preserving rev for resolve of rev |
624 preserving rev for resolve of rev |
665 $ tm "nm a b" "up a b" " " "18 merge b no ancestor" |
651 $ tm "nm a b" "up a b" " " "18 merge b no ancestor" |
666 created new head |
652 created new head |
667 -------------- |
653 -------------- |
668 test L:nm a b R:up a b W: - 18 merge b no ancestor |
654 test L:nm a b R:up a b W: - 18 merge b no ancestor |
669 -------------- |
655 -------------- |
670 unmatched files new in both: |
|
671 b |
|
672 resolving manifests |
656 resolving manifests |
673 branchmerge: True, force: False, partial: False |
657 branchmerge: True, force: False, partial: False |
674 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a |
658 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a |
675 preserving b for resolve of b |
659 preserving b for resolve of b |
676 preserving rev for resolve of rev |
660 preserving rev for resolve of rev |
709 $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" |
693 $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" |
710 created new head |
694 created new head |
711 -------------- |
695 -------------- |
712 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
696 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
713 -------------- |
697 -------------- |
714 unmatched files new in both: |
|
715 b |
|
716 resolving manifests |
698 resolving manifests |
717 branchmerge: True, force: False, partial: False |
699 branchmerge: True, force: False, partial: False |
718 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
700 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
719 preserving a for resolve of a |
701 preserving a for resolve of a |
720 preserving b for resolve of b |
702 preserving b for resolve of b |
927 6/g |
909 6/g |
928 unmatched files in other: |
910 unmatched files in other: |
929 3/g |
911 3/g |
930 4/g |
912 4/g |
931 7/f |
913 7/f |
932 unmatched files new in both: |
|
933 0/f |
|
934 1/g |
|
935 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
914 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
936 src: '1/f' -> dst: '1/g' * |
915 src: '1/f' -> dst: '1/g' * |
937 src: '3/f' -> dst: '3/g' * |
916 src: '3/f' -> dst: '3/g' * |
938 src: '4/f' -> dst: '4/g' * |
917 src: '4/f' -> dst: '4/g' * |
939 src: '5/f' -> dst: '5/g' * |
918 src: '5/f' -> dst: '5/g' * |