Show More
@@ -298,7 +298,7 b' def _formatconflictmarker(repo, ctx, tem' | |||
|
298 | 298 | '{ifeq(tags, "tip", "", "{tags} ")}' + |
|
299 | 299 | '{if(bookmarks, "{bookmarks} ")}' + |
|
300 | 300 | '{ifeq(branch, "default", "", "{branch} ")}' + |
|
301 |
'- {author|user}: |
|
|
301 | '- {author|user}: {desc|firstline}') | |
|
302 | 302 | |
|
303 | 303 | _defaultconflictlabels = ['local', 'other'] |
|
304 | 304 |
@@ -589,7 +589,7 b' Amend a merge changeset (with renames an' | |||
|
589 | 589 | no more unresolved files |
|
590 | 590 | $ hg ci -m 'merge bar' |
|
591 | 591 | $ hg log --config diff.git=1 -pr . |
|
592 |
changeset: 23: |
|
|
592 | changeset: 23:93cd4445f720 | |
|
593 | 593 | tag: tip |
|
594 | 594 | parent: 22:30d96aeaf27b |
|
595 | 595 | parent: 21:1aa437659d19 |
@@ -604,11 +604,11 b' Amend a merge changeset (with renames an' | |||
|
604 | 604 | --- a/cc |
|
605 | 605 | +++ b/cc |
|
606 | 606 | @@ -1,1 +1,5 @@ |
|
607 |
+<<<<<<< local: 30d96aeaf27b - test: |
|
|
607 | +<<<<<<< local: 30d96aeaf27b - test: aa | |
|
608 | 608 | dd |
|
609 | 609 | +======= |
|
610 | 610 | +cc |
|
611 |
+>>>>>>> other: 1aa437659d19 bar - test: |
|
|
611 | +>>>>>>> other: 1aa437659d19 bar - test: aazzcc | |
|
612 | 612 | diff --git a/z b/zz |
|
613 | 613 | rename from z |
|
614 | 614 | rename to zz |
@@ -621,7 +621,7 b' Amend a merge changeset (with renames an' | |||
|
621 | 621 | cc not renamed |
|
622 | 622 | $ hg ci --amend -m 'merge bar (amend message)' |
|
623 | 623 | $ hg log --config diff.git=1 -pr . |
|
624 |
changeset: 24: |
|
|
624 | changeset: 24:832b50f2c271 | |
|
625 | 625 | tag: tip |
|
626 | 626 | parent: 22:30d96aeaf27b |
|
627 | 627 | parent: 21:1aa437659d19 |
@@ -636,11 +636,11 b' Amend a merge changeset (with renames an' | |||
|
636 | 636 | --- a/cc |
|
637 | 637 | +++ b/cc |
|
638 | 638 | @@ -1,1 +1,5 @@ |
|
639 |
+<<<<<<< local: 30d96aeaf27b - test: |
|
|
639 | +<<<<<<< local: 30d96aeaf27b - test: aa | |
|
640 | 640 | dd |
|
641 | 641 | +======= |
|
642 | 642 | +cc |
|
643 |
+>>>>>>> other: 1aa437659d19 bar - test: |
|
|
643 | +>>>>>>> other: 1aa437659d19 bar - test: aazzcc | |
|
644 | 644 | diff --git a/z b/zz |
|
645 | 645 | rename from z |
|
646 | 646 | rename to zz |
@@ -654,7 +654,7 b' Amend a merge changeset (with renames an' | |||
|
654 | 654 | $ hg mv zz z |
|
655 | 655 | $ hg ci --amend -m 'merge bar (undo rename)' |
|
656 | 656 | $ hg log --config diff.git=1 -pr . |
|
657 |
changeset: 26: |
|
|
657 | changeset: 26:bdafc5c72f74 | |
|
658 | 658 | tag: tip |
|
659 | 659 | parent: 22:30d96aeaf27b |
|
660 | 660 | parent: 21:1aa437659d19 |
@@ -669,11 +669,11 b' Amend a merge changeset (with renames an' | |||
|
669 | 669 | --- a/cc |
|
670 | 670 | +++ b/cc |
|
671 | 671 | @@ -1,1 +1,5 @@ |
|
672 |
+<<<<<<< local: 30d96aeaf27b - test: |
|
|
672 | +<<<<<<< local: 30d96aeaf27b - test: aa | |
|
673 | 673 | dd |
|
674 | 674 | +======= |
|
675 | 675 | +cc |
|
676 |
+>>>>>>> other: 1aa437659d19 bar - test: |
|
|
676 | +>>>>>>> other: 1aa437659d19 bar - test: aazzcc | |
|
677 | 677 | |
|
678 | 678 | $ hg debugrename z |
|
679 | 679 | z not renamed |
@@ -690,9 +690,9 b' Amend a merge changeset (with renames du' | |||
|
690 | 690 | $ echo aa >> aaa |
|
691 | 691 | $ hg ci -m 'merge bar again' |
|
692 | 692 | $ hg log --config diff.git=1 -pr . |
|
693 |
changeset: 28: |
|
|
693 | changeset: 28:32f19415b634 | |
|
694 | 694 | tag: tip |
|
695 |
parent: 26: |
|
|
695 | parent: 26:bdafc5c72f74 | |
|
696 | 696 | parent: 27:4c94d5bc65f5 |
|
697 | 697 | user: test |
|
698 | 698 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -725,9 +725,9 b' Amend a merge changeset (with renames du' | |||
|
725 | 725 | $ hg mv aaa aa |
|
726 | 726 | $ hg ci --amend -m 'merge bar again (undo rename)' |
|
727 | 727 | $ hg log --config diff.git=1 -pr . |
|
728 |
changeset: 30: |
|
|
728 | changeset: 30:1e2a06b3d312 | |
|
729 | 729 | tag: tip |
|
730 |
parent: 26: |
|
|
730 | parent: 26:bdafc5c72f74 | |
|
731 | 731 | parent: 27:4c94d5bc65f5 |
|
732 | 732 | user: test |
|
733 | 733 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -765,9 +765,9 b' Amend a merge changeset (with manifest-l' | |||
|
765 | 765 | use (c)hanged version or (d)elete? c |
|
766 | 766 | $ hg ci -m 'merge bar (with conflicts)' |
|
767 | 767 | $ hg log --config diff.git=1 -pr . |
|
768 |
changeset: 33: |
|
|
768 | changeset: 33:97a298b0c59f | |
|
769 | 769 | tag: tip |
|
770 |
parent: 32: |
|
|
770 | parent: 32:3d78ce4226b8 | |
|
771 | 771 | parent: 31:67db8847a540 |
|
772 | 772 | user: test |
|
773 | 773 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -777,9 +777,9 b' Amend a merge changeset (with manifest-l' | |||
|
777 | 777 | $ hg rm aa |
|
778 | 778 | $ hg ci --amend -m 'merge bar (with conflicts, amended)' |
|
779 | 779 | $ hg log --config diff.git=1 -pr . |
|
780 |
changeset: 35: |
|
|
780 | changeset: 35:6de0c1bde1c8 | |
|
781 | 781 | tag: tip |
|
782 |
parent: 32: |
|
|
782 | parent: 32:3d78ce4226b8 | |
|
783 | 783 | parent: 31:67db8847a540 |
|
784 | 784 | user: test |
|
785 | 785 | date: Thu Jan 01 00:00:00 1970 +0000 |
@@ -22,11 +22,11 b'' | |||
|
22 | 22 | 32e80765d7fe+75234512624c+ tip |
|
23 | 23 | |
|
24 | 24 | $ cat a |
|
25 |
<<<<<<< local: 32e80765d7fe - test: |
|
|
25 | <<<<<<< local: 32e80765d7fe - test: branch2 | |
|
26 | 26 | something else |
|
27 | 27 | ======= |
|
28 | 28 | something |
|
29 |
>>>>>>> other: 75234512624c - test: |
|
|
29 | >>>>>>> other: 75234512624c - test: branch1 | |
|
30 | 30 | |
|
31 | 31 |
$ |
|
32 | 32 | M a |
@@ -1049,11 +1049,11 b' conflict: keyword should stay outside co' | |||
|
1049 | 1049 | [1] |
|
1050 | 1050 | $ cat m |
|
1051 | 1051 | $Id$ |
|
1052 |
<<<<<<< local: 88a80c8d172e - test: |
|
|
1052 | <<<<<<< local: 88a80c8d172e - test: 8bar | |
|
1053 | 1053 | bar |
|
1054 | 1054 | ======= |
|
1055 | 1055 | foo |
|
1056 |
>>>>>>> other: 85d2d2d732a5 - test: |
|
|
1056 | >>>>>>> other: 85d2d2d732a5 - test: simplemerge | |
|
1057 | 1057 | |
|
1058 | 1058 | resolve to local |
|
1059 | 1059 |
@@ -57,11 +57,11 b'' | |||
|
57 | 57 | @@ -1,3 +1,7 @@ |
|
58 | 58 | added file1 |
|
59 | 59 | another line of text |
|
60 |
+<<<<<<< working copy: c3fa057dd86f - test: |
|
|
60 | +<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2 | |
|
61 | 61 | +changed file1 different |
|
62 | 62 | +======= |
|
63 | 63 | changed file1 |
|
64 |
+>>>>>>> destination: dfab7f3c2efb - test: |
|
|
64 | +>>>>>>> destination: dfab7f3c2efb - test: changed file1 | |
|
65 | 65 | |
|
66 | 66 |
$ |
|
67 | 67 | M file1 |
@@ -66,11 +66,11 b' running from a devel copy, not a temp in' | |||
|
66 | 66 | [1] |
|
67 | 67 | $ aftermerge |
|
68 | 68 | # cat f |
|
69 |
<<<<<<< local: ef83787e2614 - test: |
|
|
69 | <<<<<<< local: ef83787e2614 - test: revision 1 | |
|
70 | 70 | revision 1 |
|
71 | 71 | ======= |
|
72 | 72 | revision 2 |
|
73 |
>>>>>>> other: 0185f4e0cf02 - test: |
|
|
73 | >>>>>>> other: 0185f4e0cf02 - test: revision 2 | |
|
74 | 74 | space |
|
75 | 75 | # hg stat |
|
76 | 76 | M f |
@@ -290,18 +290,18 b' h: l vs l, different' | |||
|
290 | 290 | U h |
|
291 | 291 | $ tellmeabout a |
|
292 | 292 | a is a plain file with content: |
|
293 |
<<<<<<< local: 0139c5610547 - test: |
|
|
293 | <<<<<<< local: 0139c5610547 - test: 2 | |
|
294 | 294 | 2 |
|
295 | 295 | ======= |
|
296 | 296 | 1 |
|
297 |
>>>>>>> other: 97e29675e796 - test: |
|
|
297 | >>>>>>> other: 97e29675e796 - test: 1 | |
|
298 | 298 | $ tellmeabout b |
|
299 | 299 | b is a plain file with content: |
|
300 |
<<<<<<< local: 0139c5610547 - test: |
|
|
300 | <<<<<<< local: 0139c5610547 - test: 2 | |
|
301 | 301 | 2 |
|
302 | 302 | ======= |
|
303 | 303 | 1 |
|
304 |
>>>>>>> other: 97e29675e796 - test: |
|
|
304 | >>>>>>> other: 97e29675e796 - test: 1 | |
|
305 | 305 | $ tellmeabout c |
|
306 | 306 | c is a plain file with content: |
|
307 | 307 | x |
@@ -345,18 +345,18 b' h: l vs l, different' | |||
|
345 | 345 | [1] |
|
346 | 346 | $ tellmeabout a |
|
347 | 347 | a is a plain file with content: |
|
348 |
<<<<<<< local: 97e29675e796 - test: |
|
|
348 | <<<<<<< local: 97e29675e796 - test: 1 | |
|
349 | 349 | 1 |
|
350 | 350 | ======= |
|
351 | 351 | 2 |
|
352 |
>>>>>>> other: 0139c5610547 - test: |
|
|
352 | >>>>>>> other: 0139c5610547 - test: 2 | |
|
353 | 353 | $ tellmeabout b |
|
354 | 354 | b is an executable file with content: |
|
355 |
<<<<<<< local: 97e29675e796 - test: |
|
|
355 | <<<<<<< local: 97e29675e796 - test: 1 | |
|
356 | 356 | 1 |
|
357 | 357 | ======= |
|
358 | 358 | 2 |
|
359 |
>>>>>>> other: 0139c5610547 - test: |
|
|
359 | >>>>>>> other: 0139c5610547 - test: 2 | |
|
360 | 360 | $ tellmeabout c |
|
361 | 361 | c is an executable file with content: |
|
362 | 362 | x |
@@ -98,11 +98,11 b' pull and merge from test-a again' | |||
|
98 | 98 | |
|
99 | 99 | $ cat test.txt |
|
100 | 100 | one |
|
101 |
<<<<<<< local: 50c3a7e29886 - test: |
|
|
101 | <<<<<<< local: 50c3a7e29886 - test: Merge 1 | |
|
102 | 102 | two-point-five |
|
103 | 103 | ======= |
|
104 | 104 | two-point-one |
|
105 |
>>>>>>> other: 40d11a4173a8 - test: |
|
|
105 | >>>>>>> other: 40d11a4173a8 - test: two -> two-point-one | |
|
106 | 106 | three |
|
107 | 107 | |
|
108 | 108 | $ hg debugindex test.txt |
@@ -210,11 +210,11 b' ensure that we have a merge with unresol' | |||
|
210 | 210 | +++ b/a/a |
|
211 | 211 | @@ -1,2 +1,6 @@ |
|
212 | 212 | a |
|
213 |
+<<<<<<< dest: * - shelve: |
|
|
213 | +<<<<<<< dest: * - shelve: pending changes temporary commit (glob) | |
|
214 | 214 | c |
|
215 | 215 | +======= |
|
216 | 216 | +a |
|
217 |
+>>>>>>> source: |
|
|
217 | +>>>>>>> source: 4702e8911fe0 - shelve: changes to '[mq]: second.patch' | |
|
218 | 218 | diff --git a/b.rename/b b/b.rename/b |
|
219 | 219 | new file mode 100644 |
|
220 | 220 | --- /dev/null |
@@ -602,11 +602,11 b' unshelve and conflicts with tracked and ' | |||
|
602 | 602 | M f |
|
603 | 603 | ? f.orig |
|
604 | 604 | $ cat f |
|
605 |
<<<<<<< dest: 5f6b880e719b - shelve: |
|
|
605 | <<<<<<< dest: 5f6b880e719b - shelve: pending changes temporary commit | |
|
606 | 606 | g |
|
607 | 607 | ======= |
|
608 | 608 | f |
|
609 |
>>>>>>> source: 23b29cada8ba - shelve: |
|
|
609 | >>>>>>> source: 23b29cada8ba - shelve: changes to 'commit stuff' | |
|
610 | 610 | $ cat f.orig |
|
611 | 611 | g |
|
612 | 612 | $ hg unshelve --abort |
@@ -645,11 +645,11 b' unshelve and conflicts with tracked and ' | |||
|
645 | 645 | M f |
|
646 | 646 | ? f.orig |
|
647 | 647 | $ cat f |
|
648 |
<<<<<<< dest: |
|
|
648 | <<<<<<< dest: * - test: intermediate other change (glob) | |
|
649 | 649 | g |
|
650 | 650 | ======= |
|
651 | 651 | f |
|
652 |
>>>>>>> source: 23b29cada8ba - shelve: |
|
|
652 | >>>>>>> source: 23b29cada8ba - shelve: changes to 'commit stuff' | |
|
653 | 653 | $ cat f.orig |
|
654 | 654 | g |
|
655 | 655 | $ hg unshelve --abort |
@@ -298,11 +298,11 b' merge tests' | |||
|
298 | 298 | should conflict |
|
299 | 299 | |
|
300 | 300 | $ cat t/t |
|
301 |
<<<<<<< local: 20a0db6fbf6c - test: |
|
|
301 | <<<<<<< local: 20a0db6fbf6c - test: 10 | |
|
302 | 302 | conflict |
|
303 | 303 | ======= |
|
304 | 304 | t3 |
|
305 |
>>>>>>> other: 7af322bc1198 - test: |
|
|
305 | >>>>>>> other: 7af322bc1198 - test: 7 | |
|
306 | 306 | |
|
307 | 307 | clone |
|
308 | 308 |
General Comments 0
You need to be logged in to leave comments.
Login now