Show More
@@ -518,7 +518,8 b' def _formatconflictmarker(repo, ctx, tem' | |||
|
518 | 518 | return util.ellipsis(mark, 80 - 8) |
|
519 | 519 | |
|
520 | 520 | _defaultconflictmarker = ('{node|short} ' |
|
521 |
'{ifeq(tags, "tip", "", |
|
|
521 | '{ifeq(tags, "tip", "", ' | |
|
522 | 'ifeq(tags, "", "", "{tags} "))}' | |
|
522 | 523 | '{if(bookmarks, "{bookmarks} ")}' |
|
523 | 524 | '{ifeq(branch, "default", "", "{branch} ")}' |
|
524 | 525 | '- {author|user}: {desc|firstline}') |
@@ -638,7 +638,7 b' Amend a merge changeset (with renames an' | |||
|
638 | 638 | (no more unresolved files) |
|
639 | 639 | $ hg ci -m 'merge bar' |
|
640 | 640 | $ hg log --config diff.git=1 -pr . |
|
641 |
changeset: 23: |
|
|
641 | changeset: 23:163cfd7219f7 | |
|
642 | 642 | tag: tip |
|
643 | 643 | parent: 22:30d96aeaf27b |
|
644 | 644 | parent: 21:1aa437659d19 |
@@ -657,7 +657,7 b' Amend a merge changeset (with renames an' | |||
|
657 | 657 | dd |
|
658 | 658 | +======= |
|
659 | 659 | +cc |
|
660 |
+>>>>>>> merge rev: 1aa437659d19 |
|
|
660 | +>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc | |
|
661 | 661 | diff --git a/z b/zz |
|
662 | 662 | rename from z |
|
663 | 663 | rename to zz |
@@ -671,7 +671,7 b' Amend a merge changeset (with renames an' | |||
|
671 | 671 | $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -m 'merge bar (amend message)' --edit |
|
672 | 672 | HGEDITFORM=commit.amend.merge |
|
673 | 673 | $ hg log --config diff.git=1 -pr . |
|
674 |
changeset: 24: |
|
|
674 | changeset: 24:bca52d4ed186 | |
|
675 | 675 | tag: tip |
|
676 | 676 | parent: 22:30d96aeaf27b |
|
677 | 677 | parent: 21:1aa437659d19 |
@@ -690,7 +690,7 b' Amend a merge changeset (with renames an' | |||
|
690 | 690 | dd |
|
691 | 691 | +======= |
|
692 | 692 | +cc |
|
693 |
+>>>>>>> merge rev: 1aa437659d19 |
|
|
693 | +>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc | |
|
694 | 694 | diff --git a/z b/zz |
|
695 | 695 | rename from z |
|
696 | 696 | rename to zz |
@@ -704,7 +704,7 b' Amend a merge changeset (with renames an' | |||
|
704 | 704 | $ hg mv zz z |
|
705 | 705 | $ hg ci --amend -m 'merge bar (undo rename)' |
|
706 | 706 | $ hg log --config diff.git=1 -pr . |
|
707 |
changeset: 26: |
|
|
707 | changeset: 26:12594a98ca3f | |
|
708 | 708 | tag: tip |
|
709 | 709 | parent: 22:30d96aeaf27b |
|
710 | 710 | parent: 21:1aa437659d19 |
@@ -723,7 +723,7 b' Amend a merge changeset (with renames an' | |||
|
723 | 723 | dd |
|
724 | 724 | +======= |
|
725 | 725 | +cc |
|
726 |
+>>>>>>> merge rev: 1aa437659d19 |
|
|
726 | +>>>>>>> merge rev: 1aa437659d19 bar - test: aazzcc | |
|
727 | 727 | |
|
728 | 728 | $ hg debugrename z |
|
729 | 729 | z not renamed |
@@ -740,9 +740,9 b' Amend a merge changeset (with renames du' | |||
|
740 | 740 | $ echo aa >> aaa |
|
741 | 741 | $ hg ci -m 'merge bar again' |
|
742 | 742 | $ hg log --config diff.git=1 -pr . |
|
743 |
changeset: 28: |
|
|
743 | changeset: 28:dffde028b388 | |
|
744 | 744 | tag: tip |
|
745 |
parent: 26: |
|
|
745 | parent: 26:12594a98ca3f | |
|
746 | 746 | parent: 27:4c94d5bc65f5 |
|
747 | 747 | user: test |
|
748 | 748 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -775,9 +775,9 b' Amend a merge changeset (with renames du' | |||
|
775 | 775 | $ hg mv aaa aa |
|
776 | 776 | $ hg ci --amend -m 'merge bar again (undo rename)' |
|
777 | 777 | $ hg log --config diff.git=1 -pr . |
|
778 |
changeset: 30: |
|
|
778 | changeset: 30:18e3ba160489 | |
|
779 | 779 | tag: tip |
|
780 |
parent: 26: |
|
|
780 | parent: 26:12594a98ca3f | |
|
781 | 781 | parent: 27:4c94d5bc65f5 |
|
782 | 782 | user: test |
|
783 | 783 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -817,9 +817,9 b' Amend a merge changeset (with manifest-l' | |||
|
817 | 817 | use (c)hanged version, (d)elete, or leave (u)nresolved? c |
|
818 | 818 | $ hg ci -m 'merge bar (with conflicts)' |
|
819 | 819 | $ hg log --config diff.git=1 -pr . |
|
820 |
changeset: 33: |
|
|
820 | changeset: 33:b4c3035e2544 | |
|
821 | 821 | tag: tip |
|
822 |
parent: 32: |
|
|
822 | parent: 32:4b216ca5ba97 | |
|
823 | 823 | parent: 31:67db8847a540 |
|
824 | 824 | user: test |
|
825 | 825 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -829,9 +829,9 b' Amend a merge changeset (with manifest-l' | |||
|
829 | 829 | $ hg rm aa |
|
830 | 830 | $ hg ci --amend -m 'merge bar (with conflicts, amended)' |
|
831 | 831 | $ hg log --config diff.git=1 -pr . |
|
832 |
changeset: 35: |
|
|
832 | changeset: 35:1205ed810051 | |
|
833 | 833 | tag: tip |
|
834 |
parent: 32: |
|
|
834 | parent: 32:4b216ca5ba97 | |
|
835 | 835 | parent: 31:67db8847a540 |
|
836 | 836 | user: test |
|
837 | 837 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -927,7 +927,7 b' Test that "diff()" in committemplate wor' | |||
|
927 | 927 | HG: M: |
|
928 | 928 | HG: A: foo |
|
929 | 929 | HG: R: |
|
930 |
HG: diff -r |
|
|
930 | HG: diff -r 1205ed810051 foo | |
|
931 | 931 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
932 | 932 | HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
|
933 | 933 | HG: @@ -0,0 +1,1 @@ |
@@ -941,12 +941,12 b' Test that "diff()" in committemplate wor' | |||
|
941 | 941 | HG: M: |
|
942 | 942 | HG: A: foo y |
|
943 | 943 | HG: R: |
|
944 |
HG: diff -r |
|
|
944 | HG: diff -r 1205ed810051 foo | |
|
945 | 945 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
946 | 946 | HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
|
947 | 947 | HG: @@ -0,0 +1,1 @@ |
|
948 | 948 | HG: +foo |
|
949 |
HG: diff -r |
|
|
949 | HG: diff -r 1205ed810051 y | |
|
950 | 950 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
951 | 951 | HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
|
952 | 952 | HG: @@ -0,0 +1,1 @@ |
@@ -959,18 +959,18 b' Test that "diff()" in committemplate wor' | |||
|
959 | 959 | HG: M: |
|
960 | 960 | HG: A: foo y |
|
961 | 961 | HG: R: a |
|
962 |
HG: diff -r |
|
|
962 | HG: diff -r 1205ed810051 a | |
|
963 | 963 | HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
964 | 964 | HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
965 | 965 | HG: @@ -1,2 +0,0 @@ |
|
966 | 966 | HG: -a |
|
967 | 967 | HG: -a |
|
968 |
HG: diff -r |
|
|
968 | HG: diff -r 1205ed810051 foo | |
|
969 | 969 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
970 | 970 | HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
|
971 | 971 | HG: @@ -0,0 +1,1 @@ |
|
972 | 972 | HG: +foo |
|
973 |
HG: diff -r |
|
|
973 | HG: diff -r 1205ed810051 y | |
|
974 | 974 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
975 | 975 | HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
|
976 | 976 | HG: @@ -0,0 +1,1 @@ |
@@ -983,23 +983,23 b' Test that "diff()" in committemplate wor' | |||
|
983 | 983 | HG: M: |
|
984 | 984 | HG: A: foo y |
|
985 | 985 | HG: R: a x |
|
986 |
HG: diff -r |
|
|
986 | HG: diff -r 1205ed810051 a | |
|
987 | 987 | HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
988 | 988 | HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
989 | 989 | HG: @@ -1,2 +0,0 @@ |
|
990 | 990 | HG: -a |
|
991 | 991 | HG: -a |
|
992 |
HG: diff -r |
|
|
992 | HG: diff -r 1205ed810051 foo | |
|
993 | 993 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
994 | 994 | HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
|
995 | 995 | HG: @@ -0,0 +1,1 @@ |
|
996 | 996 | HG: +foo |
|
997 |
HG: diff -r |
|
|
997 | HG: diff -r 1205ed810051 x | |
|
998 | 998 | HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 |
|
999 | 999 | HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1000 | 1000 | HG: @@ -1,1 +0,0 @@ |
|
1001 | 1001 | HG: -x |
|
1002 |
HG: diff -r |
|
|
1002 | HG: diff -r 1205ed810051 y | |
|
1003 | 1003 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1004 | 1004 | HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
|
1005 | 1005 | HG: @@ -0,0 +1,1 @@ |
@@ -1014,23 +1014,23 b' Test that "diff()" in committemplate wor' | |||
|
1014 | 1014 | HG: M: |
|
1015 | 1015 | HG: A: foo y |
|
1016 | 1016 | HG: R: a x |
|
1017 |
HG: diff -r |
|
|
1017 | HG: diff -r 1205ed810051 a | |
|
1018 | 1018 | HG: --- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
1019 | 1019 | HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1020 | 1020 | HG: @@ -1,2 +0,0 @@ |
|
1021 | 1021 | HG: -a |
|
1022 | 1022 | HG: -a |
|
1023 |
HG: diff -r |
|
|
1023 | HG: diff -r 1205ed810051 foo | |
|
1024 | 1024 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1025 | 1025 | HG: +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
|
1026 | 1026 | HG: @@ -0,0 +1,1 @@ |
|
1027 | 1027 | HG: +foo |
|
1028 |
HG: diff -r |
|
|
1028 | HG: diff -r 1205ed810051 x | |
|
1029 | 1029 | HG: --- a/x Thu Jan 01 00:00:00 1970 +0000 |
|
1030 | 1030 | HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1031 | 1031 | HG: @@ -1,1 +0,0 @@ |
|
1032 | 1032 | HG: -x |
|
1033 |
HG: diff -r |
|
|
1033 | HG: diff -r 1205ed810051 y | |
|
1034 | 1034 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
1035 | 1035 | HG: +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
|
1036 | 1036 | HG: @@ -0,0 +1,1 @@ |
@@ -55,7 +55,7 b'' | |||
|
55 | 55 | ======= |
|
56 | 56 | 4 |
|
57 | 57 | 5 |
|
58 |
>>>>>>> merge rev: c0c68e4fe667 |
|
|
58 | >>>>>>> merge rev: c0c68e4fe667 - test: branch1 | |
|
59 | 59 | Hop we are done. |
|
60 | 60 | |
|
61 | 61 | $ hg status |
@@ -456,7 +456,7 b' Resolve conflicted graft' | |||
|
456 | 456 | c |
|
457 | 457 | ======= |
|
458 | 458 | b |
|
459 |
>>>>>>> graft: 5d205f8b35b6 |
|
|
459 | >>>>>>> graft: 5d205f8b35b6 - bar: 1 | |
|
460 | 460 | $ echo b > a |
|
461 | 461 | $ hg resolve -m a |
|
462 | 462 | (no more unresolved files) |
@@ -1117,7 +1117,7 b' conflict: keyword should stay outside co' | |||
|
1117 | 1117 | bar |
|
1118 | 1118 | ======= |
|
1119 | 1119 | foo |
|
1120 |
>>>>>>> merge rev: 85d2d2d732a5 |
|
|
1120 | >>>>>>> merge rev: 85d2d2d732a5 - test: simplemerge | |
|
1121 | 1121 | |
|
1122 | 1122 | resolve to local, m must contain hash of last change (local parent) |
|
1123 | 1123 |
@@ -107,7 +107,7 b' Non-interactive merge:' | |||
|
107 | 107 | changed2 |
|
108 | 108 | ======= |
|
109 | 109 | changed1 |
|
110 |
>>>>>>> merge rev: 10f9a0a634e8 |
|
|
110 | >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... | |
|
111 | 111 | |
|
112 | 112 | |
|
113 | 113 | Interactive merge: |
@@ -171,7 +171,7 b' Interactive merge:' | |||
|
171 | 171 | changed2 |
|
172 | 172 | ======= |
|
173 | 173 | changed1 |
|
174 |
>>>>>>> merge rev: 10f9a0a634e8 |
|
|
174 | >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... | |
|
175 | 175 | |
|
176 | 176 | |
|
177 | 177 | Interactive merge with bad input: |
@@ -247,7 +247,7 b' Interactive merge with bad input:' | |||
|
247 | 247 | changed2 |
|
248 | 248 | ======= |
|
249 | 249 | changed1 |
|
250 |
>>>>>>> merge rev: 10f9a0a634e8 |
|
|
250 | >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... | |
|
251 | 251 | |
|
252 | 252 | |
|
253 | 253 | Interactive merge with not enough input: |
@@ -310,7 +310,7 b' Interactive merge with not enough input:' | |||
|
310 | 310 | changed2 |
|
311 | 311 | ======= |
|
312 | 312 | changed1 |
|
313 |
>>>>>>> merge rev: 10f9a0a634e8 |
|
|
313 | >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... | |
|
314 | 314 | |
|
315 | 315 | Choose local versions of files |
|
316 | 316 | |
@@ -635,7 +635,7 b' Choose to merge all files' | |||
|
635 | 635 | ||||||| base |
|
636 | 636 | ======= |
|
637 | 637 | changed1 |
|
638 |
>>>>>>> merge rev: 10f9a0a634e8 |
|
|
638 | >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... | |
|
639 | 639 | |
|
640 | 640 | Exercise transitions between local, other, fail and prompt, and make sure the |
|
641 | 641 | dirstate stays consistent. (Compare with each other and to the above |
@@ -379,7 +379,7 b' the remote side did not touch the file' | |||
|
379 | 379 | content1 |
|
380 | 380 | ======= |
|
381 | 381 | content2 |
|
382 |
>>>>>>> merge rev: 85100b8c675b |
|
|
382 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
|
383 | 383 | |
|
384 | 384 | M content1_content2_content1_content4-untracked |
|
385 | 385 | content2 |
@@ -409,7 +409,7 b' the remote side did not touch the file' | |||
|
409 | 409 | content1 |
|
410 | 410 | ======= |
|
411 | 411 | content2 |
|
412 |
>>>>>>> merge rev: 85100b8c675b |
|
|
412 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
|
413 | 413 | |
|
414 | 414 | M content1_content2_content2_content4-untracked |
|
415 | 415 | content2 |
@@ -439,7 +439,7 b' the remote side did not touch the file' | |||
|
439 | 439 | content1 |
|
440 | 440 | ======= |
|
441 | 441 | content2 |
|
442 |
>>>>>>> merge rev: 85100b8c675b |
|
|
442 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
|
443 | 443 | |
|
444 | 444 | M content1_content2_content3_content3-untracked |
|
445 | 445 | content2 |
@@ -451,7 +451,7 b' the remote side did not touch the file' | |||
|
451 | 451 | content1 |
|
452 | 452 | ======= |
|
453 | 453 | content2 |
|
454 |
>>>>>>> merge rev: 85100b8c675b |
|
|
454 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
|
455 | 455 | |
|
456 | 456 | M content1_content2_content3_content4-untracked |
|
457 | 457 | content2 |
@@ -481,7 +481,7 b' the remote side did not touch the file' | |||
|
481 | 481 | content1 |
|
482 | 482 | ======= |
|
483 | 483 | content2 |
|
484 |
>>>>>>> merge rev: 85100b8c675b |
|
|
484 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
|
485 | 485 | |
|
486 | 486 | M content1_content2_missing_content4-untracked |
|
487 | 487 | content2 |
@@ -564,7 +564,7 b' the remote side did not touch the file' | |||
|
564 | 564 | ||||||| base |
|
565 | 565 | ======= |
|
566 | 566 | content2 |
|
567 |
>>>>>>> merge rev: 85100b8c675b |
|
|
567 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
|
568 | 568 | |
|
569 | 569 | M missing_content2_content2_content4-untracked |
|
570 | 570 | content2 |
@@ -587,7 +587,7 b' the remote side did not touch the file' | |||
|
587 | 587 | ||||||| base |
|
588 | 588 | ======= |
|
589 | 589 | content2 |
|
590 |
>>>>>>> merge rev: 85100b8c675b |
|
|
590 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
|
591 | 591 | |
|
592 | 592 | M missing_content2_content3_content3-untracked |
|
593 | 593 | content2 |
@@ -598,7 +598,7 b' the remote side did not touch the file' | |||
|
598 | 598 | ||||||| base |
|
599 | 599 | ======= |
|
600 | 600 | content2 |
|
601 |
>>>>>>> merge rev: 85100b8c675b |
|
|
601 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
|
602 | 602 | |
|
603 | 603 | M missing_content2_content3_content4-untracked |
|
604 | 604 | content2 |
@@ -621,7 +621,7 b' the remote side did not touch the file' | |||
|
621 | 621 | ||||||| base |
|
622 | 622 | ======= |
|
623 | 623 | content2 |
|
624 |
>>>>>>> merge rev: 85100b8c675b |
|
|
624 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
|
625 | 625 | |
|
626 | 626 | M missing_content2_missing_content4-untracked |
|
627 | 627 | <<<<<<< working copy: 0447570f1af6 - test: local |
@@ -629,7 +629,7 b' the remote side did not touch the file' | |||
|
629 | 629 | ||||||| base |
|
630 | 630 | ======= |
|
631 | 631 | content2 |
|
632 |
>>>>>>> merge rev: 85100b8c675b |
|
|
632 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
|
633 | 633 | |
|
634 | 634 | M missing_content2_missing_missing-tracked |
|
635 | 635 | content2 |
@@ -56,7 +56,7 b'' | |||
|
56 | 56 | @@ -1,3 +1,7 @@ |
|
57 | 57 | added file1 |
|
58 | 58 | another line of text |
|
59 |
+<<<<<<< working copy: c3fa057dd86f |
|
|
59 | +<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2 | |
|
60 | 60 | +changed file1 different |
|
61 | 61 | +======= |
|
62 | 62 | changed file1 |
@@ -75,11 +75,11 b' running from a devel copy, not a temp in' | |||
|
75 | 75 | [1] |
|
76 | 76 | $ aftermerge |
|
77 | 77 | # cat f |
|
78 |
<<<<<<< working copy: ef83787e2614 |
|
|
78 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
|
79 | 79 | revision 1 |
|
80 | 80 | ======= |
|
81 | 81 | revision 2 |
|
82 |
>>>>>>> merge rev: 0185f4e0cf02 |
|
|
82 | >>>>>>> merge rev: 0185f4e0cf02 - test: revision 2 | |
|
83 | 83 | space |
|
84 | 84 | # hg stat |
|
85 | 85 | M f |
@@ -935,7 +935,7 b' premerge=keep keeps conflict markers in:' | |||
|
935 | 935 | # hg update -C 1 |
|
936 | 936 | $ hg merge -r 4 --config merge-tools.true.premerge=keep |
|
937 | 937 | merging f |
|
938 |
<<<<<<< working copy: ef83787e2614 |
|
|
938 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
|
939 | 939 | revision 1 |
|
940 | 940 | space |
|
941 | 941 | ======= |
@@ -948,7 +948,7 b' premerge=keep keeps conflict markers in:' | |||
|
948 | 948 | (branch merge, don't forget to commit) |
|
949 | 949 | $ aftermerge |
|
950 | 950 | # cat f |
|
951 |
<<<<<<< working copy: ef83787e2614 |
|
|
951 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
|
952 | 952 | revision 1 |
|
953 | 953 | space |
|
954 | 954 | ======= |
@@ -969,7 +969,7 b' premerge=keep-merge3 keeps conflict mark' | |||
|
969 | 969 | # hg update -C 1 |
|
970 | 970 | $ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3 |
|
971 | 971 | merging f |
|
972 |
<<<<<<< working copy: ef83787e2614 |
|
|
972 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
|
973 | 973 | revision 1 |
|
974 | 974 | space |
|
975 | 975 | ||||||| base |
@@ -985,7 +985,7 b' premerge=keep-merge3 keeps conflict mark' | |||
|
985 | 985 | (branch merge, don't forget to commit) |
|
986 | 986 | $ aftermerge |
|
987 | 987 | # cat f |
|
988 |
<<<<<<< working copy: ef83787e2614 |
|
|
988 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
|
989 | 989 | revision 1 |
|
990 | 990 | space |
|
991 | 991 | ||||||| base |
@@ -367,14 +367,14 b' h: l vs l, different' | |||
|
367 | 367 | 2 |
|
368 | 368 | ======= |
|
369 | 369 | 1 |
|
370 |
>>>>>>> merge rev: 2e60aa20b912 |
|
|
370 | >>>>>>> merge rev: 2e60aa20b912 - test: 1 | |
|
371 | 371 | $ tellmeabout b |
|
372 | 372 | b is a plain file with content: |
|
373 | 373 | <<<<<<< working copy: 0c617753b41b - test: 2 |
|
374 | 374 | 2 |
|
375 | 375 | ======= |
|
376 | 376 | 1 |
|
377 |
>>>>>>> merge rev: 2e60aa20b912 |
|
|
377 | >>>>>>> merge rev: 2e60aa20b912 - test: 1 | |
|
378 | 378 | $ tellmeabout c |
|
379 | 379 | c is a plain file with content: |
|
380 | 380 | x |
@@ -418,14 +418,14 b' h: l vs l, different' | |||
|
418 | 418 | [1] |
|
419 | 419 | $ tellmeabout a |
|
420 | 420 | a is a plain file with content: |
|
421 |
<<<<<<< working copy: 2e60aa20b912 |
|
|
421 | <<<<<<< working copy: 2e60aa20b912 - test: 1 | |
|
422 | 422 | 1 |
|
423 | 423 | ======= |
|
424 | 424 | 2 |
|
425 | 425 | >>>>>>> merge rev: 0c617753b41b - test: 2 |
|
426 | 426 | $ tellmeabout b |
|
427 | 427 | b is an executable file with content: |
|
428 |
<<<<<<< working copy: 2e60aa20b912 |
|
|
428 | <<<<<<< working copy: 2e60aa20b912 - test: 1 | |
|
429 | 429 | 1 |
|
430 | 430 | ======= |
|
431 | 431 | 2 |
@@ -99,7 +99,7 b' pull and merge from test-a again' | |||
|
99 | 99 | |
|
100 | 100 | $ cat test.txt |
|
101 | 101 | one |
|
102 |
<<<<<<< working copy: 50c3a7e29886 |
|
|
102 | <<<<<<< working copy: 50c3a7e29886 - test: Merge 1 | |
|
103 | 103 | two-point-five |
|
104 | 104 | ======= |
|
105 | 105 | two-point-one |
@@ -836,7 +836,7 b' running into merge conflict and invoking' | |||
|
836 | 836 | rebasing 2:b8d8db2b242d "a-dev" (tip) |
|
837 | 837 | saved backup bundle to $TESTTMP/collapse_remember_message/.hg/strip-backup/b8d8db2b242d-f474c19a-backup.hg (glob) |
|
838 | 838 | $ hg log |
|
839 |
changeset: 2: |
|
|
839 | changeset: 2:45ba1d1a8665 | |
|
840 | 840 | tag: tip |
|
841 | 841 | user: test |
|
842 | 842 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -333,7 +333,7 b' Test minimization of merge conflicts' | |||
|
333 | 333 | @@ -1,2 +1,6 @@ |
|
334 | 334 | a |
|
335 | 335 | b |
|
336 |
+<<<<<<< dest: 328e4ab1f7cc |
|
|
336 | +<<<<<<< dest: 328e4ab1f7cc ab - test: ab | |
|
337 | 337 | +======= |
|
338 | 338 | +c |
|
339 | 339 | +>>>>>>> source: 7bc217434fc1 - test: abc |
@@ -352,7 +352,7 b' Test minimization of merge conflicts' | |||
|
352 | 352 | +++ b/a * (glob) |
|
353 | 353 | @@ -1,2 +1,8 @@ |
|
354 | 354 | a |
|
355 |
+<<<<<<< dest: 328e4ab1f7cc |
|
|
355 | +<<<<<<< dest: 328e4ab1f7cc ab - test: ab | |
|
356 | 356 | b |
|
357 | 357 | +||||||| base |
|
358 | 358 | +======= |
@@ -148,7 +148,7 b' and committed in local target directory.' | |||
|
148 | 148 | target |
|
149 | 149 | ======= |
|
150 | 150 | baz |
|
151 |
>>>>>>> merge rev: ce36d17b18fb |
|
|
151 | >>>>>>> merge rev: ce36d17b18fb - test: 2 add a/c | |
|
152 | 152 | $ rm b/c.orig |
|
153 | 153 | |
|
154 | 154 | Remote directory rename with conflicting file added in remote target directory |
@@ -177,7 +177,7 b' and committed in local source directory.' | |||
|
177 | 177 | ? a/d |
|
178 | 178 | ? b/c.orig |
|
179 | 179 | $ cat b/c |
|
180 |
<<<<<<< working copy: ce36d17b18fb |
|
|
180 | <<<<<<< working copy: ce36d17b18fb - test: 2 add a/c | |
|
181 | 181 | baz |
|
182 | 182 | ======= |
|
183 | 183 | target |
@@ -332,7 +332,7 b' ensure that we have a merge with unresol' | |||
|
332 | 332 | +++ b/a/a |
|
333 | 333 | @@ -1,2 +1,6 @@ |
|
334 | 334 | a |
|
335 |
+<<<<<<< dest: * |
|
|
335 | +<<<<<<< dest: * - shelve: pending changes temporary commit (glob) | |
|
336 | 336 | c |
|
337 | 337 | +======= |
|
338 | 338 | +a |
@@ -759,7 +759,7 b' unshelve and conflicts with tracked and ' | |||
|
759 | 759 | M f |
|
760 | 760 | ? f.orig |
|
761 | 761 | $ cat f |
|
762 |
<<<<<<< dest: 5f6b880e719b |
|
|
762 | <<<<<<< dest: 5f6b880e719b - shelve: pending changes temporary commit | |
|
763 | 763 | g |
|
764 | 764 | ======= |
|
765 | 765 | f |
@@ -804,7 +804,7 b' unshelve and conflicts with tracked and ' | |||
|
804 | 804 | M f |
|
805 | 805 | ? f.orig |
|
806 | 806 | $ cat f |
|
807 |
<<<<<<< dest: * |
|
|
807 | <<<<<<< dest: * - test: intermediate other change (glob) | |
|
808 | 808 | g |
|
809 | 809 | ======= |
|
810 | 810 | f |
General Comments 0
You need to be logged in to leave comments.
Login now