Show More
@@ -4914,7 +4914,7 b' def merge(ui, repo, node=None, **opts):' | |||||
4914 | overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} |
|
4914 | overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} | |
4915 | with ui.configoverride(overrides, b'merge'): |
|
4915 | with ui.configoverride(overrides, b'merge'): | |
4916 | force = opts.get(b'force') |
|
4916 | force = opts.get(b'force') | |
4917 | labels = [b'working copy', b'merge rev'] |
|
4917 | labels = [b'working copy', b'merge rev', b'common ancestor'] | |
4918 | return hg.merge(ctx, force=force, labels=labels) |
|
4918 | return hg.merge(ctx, force=force, labels=labels) | |
4919 |
|
4919 | |||
4920 |
|
4920 |
@@ -221,16 +221,16 b' annotate -nlf b' | |||||
221 | a |
|
221 | a | |
222 | a |
|
222 | a | |
223 | a |
|
223 | a | |
224 | <<<<<<< working copy: 5fbdc1152d97 - test: b2.1 |
|
224 | <<<<<<< working copy: 5fbdc1152d97 - test: b2.1 | |
225 | b4 |
|
225 | b4 | |
226 | c |
|
226 | c | |
227 | b5 |
|
227 | b5 | |
228 |
||||||| |
|
228 | ||||||| common ancestor: 3086dbafde1c - test: b | |
229 | ======= |
|
229 | ======= | |
230 | b4 |
|
230 | b4 | |
231 | b5 |
|
231 | b5 | |
232 | b6 |
|
232 | b6 | |
233 | >>>>>>> merge rev: 37ec9f5c3d1f - test: b2 |
|
233 | >>>>>>> merge rev: 37ec9f5c3d1f - test: b2 | |
234 | $ cat <<EOF > b |
|
234 | $ cat <<EOF > b | |
235 | > a |
|
235 | > a | |
236 | > a |
|
236 | > a | |
@@ -747,16 +747,16 b' merge' | |||||
747 | 0 |
|
747 | 0 | |
748 | 1 baz:1 |
|
748 | 1 baz:1 | |
749 | 2 baz:2 |
|
749 | 2 baz:2 | |
750 | <<<<<<< working copy: 863de62655ef - test: baz:3+->3- |
|
750 | <<<<<<< working copy: 863de62655ef - test: baz:3+->3- | |
751 | 3- baz:3 |
|
751 | 3- baz:3 | |
752 | 4 baz:4 |
|
752 | 4 baz:4 | |
753 |
||||||| |
|
753 | ||||||| common ancestor: 56fc739c091f - test: baz:3->3+ | |
754 | 3+ baz:3 |
|
754 | 3+ baz:3 | |
755 | 4 baz:4 |
|
755 | 4 baz:4 | |
756 | ======= |
|
756 | ======= | |
757 | 3+ baz:3 |
|
757 | 3+ baz:3 | |
758 | 4+ baz:4 |
|
758 | 4+ baz:4 | |
759 | >>>>>>> merge rev: cb8df70ae185 - test: qux:4->4+ |
|
759 | >>>>>>> merge rev: cb8df70ae185 - test: qux:4->4+ | |
760 | 5 |
|
760 | 5 | |
761 | 6 |
|
761 | 6 | |
762 | 7 |
|
762 | 7 | |
@@ -794,16 +794,16 b' merge' | |||||
794 | 0 |
|
794 | 0 | |
795 | 1 baz:1 |
|
795 | 1 baz:1 | |
796 | 2 baz:2 |
|
796 | 2 baz:2 | |
797 | <<<<<<< working copy: cb8df70ae185 - test: qux:4->4+ |
|
797 | <<<<<<< working copy: cb8df70ae185 - test: qux:4->4+ | |
798 | 3+ baz:3 |
|
798 | 3+ baz:3 | |
799 | 4+ baz:4 |
|
799 | 4+ baz:4 | |
800 |
||||||| |
|
800 | ||||||| common ancestor: 56fc739c091f - test: baz:3->3+ | |
801 | 3+ baz:3 |
|
801 | 3+ baz:3 | |
802 | 4 baz:4 |
|
802 | 4 baz:4 | |
803 | ======= |
|
803 | ======= | |
804 | 3- baz:3 |
|
804 | 3- baz:3 | |
805 | 4 baz:4 |
|
805 | 4 baz:4 | |
806 | >>>>>>> merge rev: 863de62655ef - test: baz:3+->3- |
|
806 | >>>>>>> merge rev: 863de62655ef - test: baz:3+->3- | |
807 | 5 |
|
807 | 5 | |
808 | 6 |
|
808 | 6 | |
809 | 7 |
|
809 | 7 | |
@@ -1172,16 +1172,16 b' Issue5360: Deleted chunk in p1 of a merg' | |||||
1172 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
1172 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
1173 | [1] |
|
1173 | [1] | |
1174 | $ cat a |
|
1174 | $ cat a | |
1175 | <<<<<<< working copy: 0a068f0261cf - test: 3 |
|
1175 | <<<<<<< working copy: 0a068f0261cf - test: 3 | |
1176 | 1 |
|
1176 | 1 | |
1177 | 2 |
|
1177 | 2 | |
1178 | 3 |
|
1178 | 3 | |
1179 |
||||||| |
|
1179 | ||||||| common ancestor: 1ed24be7e7a0 - test: 2 | |
1180 | 1 |
|
1180 | 1 | |
1181 | 2 |
|
1181 | 2 | |
1182 | ======= |
|
1182 | ======= | |
1183 | a |
|
1183 | a | |
1184 | >>>>>>> merge rev: 9409851bc20a - test: a |
|
1184 | >>>>>>> merge rev: 9409851bc20a - test: a | |
1185 | $ cat > a << EOF |
|
1185 | $ cat > a << EOF | |
1186 | > b |
|
1186 | > b | |
1187 | > 1 |
|
1187 | > 1 |
@@ -267,7 +267,7 b' internal:merge3' | |||||
267 | 3 |
|
267 | 3 | |
268 | 6 |
|
268 | 6 | |
269 | 8 |
|
269 | 8 | |
270 |
||||||| |
|
270 | ||||||| common ancestor | |
271 | One |
|
271 | One | |
272 | Two |
|
272 | Two | |
273 | Three |
|
273 | Three |
@@ -165,16 +165,16 b' annotate -nlf b' | |||||
165 | a |
|
165 | a | |
166 | a |
|
166 | a | |
167 | a |
|
167 | a | |
168 | <<<<<<< working copy: 5fbdc1152d97 - test: b2.1 |
|
168 | <<<<<<< working copy: 5fbdc1152d97 - test: b2.1 | |
169 | b4 |
|
169 | b4 | |
170 | c |
|
170 | c | |
171 | b5 |
|
171 | b5 | |
172 |
||||||| |
|
172 | ||||||| common ancestor: 3086dbafde1c - test: b | |
173 | ======= |
|
173 | ======= | |
174 | b4 |
|
174 | b4 | |
175 | b5 |
|
175 | b5 | |
176 | b6 |
|
176 | b6 | |
177 | >>>>>>> merge rev: 37ec9f5c3d1f - test: b2 |
|
177 | >>>>>>> merge rev: 37ec9f5c3d1f - test: b2 | |
178 | $ cat <<EOF > b |
|
178 | $ cat <<EOF > b | |
179 | > a |
|
179 | > a | |
180 | > a |
|
180 | > a | |
@@ -789,16 +789,16 b' Issue5360: Deleted chunk in p1 of a merg' | |||||
789 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
789 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
790 | [1] |
|
790 | [1] | |
791 | $ cat a |
|
791 | $ cat a | |
792 | <<<<<<< working copy: 0a068f0261cf - test: 3 |
|
792 | <<<<<<< working copy: 0a068f0261cf - test: 3 | |
793 | 1 |
|
793 | 1 | |
794 | 2 |
|
794 | 2 | |
795 | 3 |
|
795 | 3 | |
796 |
||||||| |
|
796 | ||||||| common ancestor: 1ed24be7e7a0 - test: 2 | |
797 | 1 |
|
797 | 1 | |
798 | 2 |
|
798 | 2 | |
799 | ======= |
|
799 | ======= | |
800 | a |
|
800 | a | |
801 | >>>>>>> merge rev: 9409851bc20a - test: a |
|
801 | >>>>>>> merge rev: 9409851bc20a - test: a | |
802 | $ cat > a << EOF |
|
802 | $ cat > a << EOF | |
803 | > b |
|
803 | > b | |
804 | > 1 |
|
804 | > 1 |
@@ -680,12 +680,12 b' Choose to merge all files' | |||||
680 | changed |
|
680 | changed | |
681 | --- file3 --- |
|
681 | --- file3 --- | |
682 | 3 |
|
682 | 3 | |
683 |
<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, c |
|
683 | <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, c... | |
684 | changed2 |
|
684 | changed2 | |
685 |
||||||| |
|
685 | ||||||| common ancestor: ab57bf49aa27 - test: added files | |
686 | ======= |
|
686 | ======= | |
687 | changed1 |
|
687 | changed1 | |
688 |
>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, c |
|
688 | >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, c... | |
689 |
|
689 | |||
690 | Exercise transitions between local, other, fail and prompt, and make sure the |
|
690 | Exercise transitions between local, other, fail and prompt, and make sure the | |
691 | dirstate stays consistent. (Compare with each other and to the above |
|
691 | dirstate stays consistent. (Compare with each other and to the above |
@@ -398,13 +398,13 b' the remote side did not touch the file' | |||||
398 | content2 |
|
398 | content2 | |
399 |
|
399 | |||
400 | M content1_content2_content1_content4-tracked |
|
400 | M content1_content2_content1_content4-tracked | |
401 | <<<<<<< working copy: 0447570f1af6 - test: local |
|
401 | <<<<<<< working copy: 0447570f1af6 - test: local | |
402 | content4 |
|
402 | content4 | |
403 |
||||||| |
|
403 | ||||||| common ancestor: 8ef80617fa20 - test: base | |
404 | content1 |
|
404 | content1 | |
405 | ======= |
|
405 | ======= | |
406 | content2 |
|
406 | content2 | |
407 | >>>>>>> merge rev: 85100b8c675b - test: remote |
|
407 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
408 |
|
408 | |||
409 | M content1_content2_content1_content4-untracked |
|
409 | M content1_content2_content1_content4-untracked | |
410 | content2 |
|
410 | content2 | |
@@ -428,13 +428,13 b' the remote side did not touch the file' | |||||
428 | content2 |
|
428 | content2 | |
429 |
|
429 | |||
430 | M content1_content2_content2_content4-tracked |
|
430 | M content1_content2_content2_content4-tracked | |
431 | <<<<<<< working copy: 0447570f1af6 - test: local |
|
431 | <<<<<<< working copy: 0447570f1af6 - test: local | |
432 | content4 |
|
432 | content4 | |
433 |
||||||| |
|
433 | ||||||| common ancestor: 8ef80617fa20 - test: base | |
434 | content1 |
|
434 | content1 | |
435 | ======= |
|
435 | ======= | |
436 | content2 |
|
436 | content2 | |
437 | >>>>>>> merge rev: 85100b8c675b - test: remote |
|
437 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
438 |
|
438 | |||
439 | M content1_content2_content2_content4-untracked |
|
439 | M content1_content2_content2_content4-untracked | |
440 | content2 |
|
440 | content2 | |
@@ -458,25 +458,25 b' the remote side did not touch the file' | |||||
458 | content2 |
|
458 | content2 | |
459 |
|
459 | |||
460 | M content1_content2_content3_content3-tracked |
|
460 | M content1_content2_content3_content3-tracked | |
461 | <<<<<<< working copy: 0447570f1af6 - test: local |
|
461 | <<<<<<< working copy: 0447570f1af6 - test: local | |
462 | content3 |
|
462 | content3 | |
463 |
||||||| |
|
463 | ||||||| common ancestor: 8ef80617fa20 - test: base | |
464 | content1 |
|
464 | content1 | |
465 | ======= |
|
465 | ======= | |
466 | content2 |
|
466 | content2 | |
467 | >>>>>>> merge rev: 85100b8c675b - test: remote |
|
467 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
468 |
|
468 | |||
469 | M content1_content2_content3_content3-untracked |
|
469 | M content1_content2_content3_content3-untracked | |
470 | content2 |
|
470 | content2 | |
471 |
|
471 | |||
472 | M content1_content2_content3_content4-tracked |
|
472 | M content1_content2_content3_content4-tracked | |
473 | <<<<<<< working copy: 0447570f1af6 - test: local |
|
473 | <<<<<<< working copy: 0447570f1af6 - test: local | |
474 | content4 |
|
474 | content4 | |
475 |
||||||| |
|
475 | ||||||| common ancestor: 8ef80617fa20 - test: base | |
476 | content1 |
|
476 | content1 | |
477 | ======= |
|
477 | ======= | |
478 | content2 |
|
478 | content2 | |
479 | >>>>>>> merge rev: 85100b8c675b - test: remote |
|
479 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
480 |
|
480 | |||
481 | M content1_content2_content3_content4-untracked |
|
481 | M content1_content2_content3_content4-untracked | |
482 | content2 |
|
482 | content2 | |
@@ -500,13 +500,13 b' the remote side did not touch the file' | |||||
500 | content2 |
|
500 | content2 | |
501 |
|
501 | |||
502 | M content1_content2_missing_content4-tracked |
|
502 | M content1_content2_missing_content4-tracked | |
503 | <<<<<<< working copy: 0447570f1af6 - test: local |
|
503 | <<<<<<< working copy: 0447570f1af6 - test: local | |
504 | content4 |
|
504 | content4 | |
505 |
||||||| |
|
505 | ||||||| common ancestor: 8ef80617fa20 - test: base | |
506 | content1 |
|
506 | content1 | |
507 | ======= |
|
507 | ======= | |
508 | content2 |
|
508 | content2 | |
509 | >>>>>>> merge rev: 85100b8c675b - test: remote |
|
509 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
510 |
|
510 | |||
511 | M content1_content2_missing_content4-untracked |
|
511 | M content1_content2_missing_content4-untracked | |
512 | content2 |
|
512 | content2 | |
@@ -584,12 +584,12 b' the remote side did not touch the file' | |||||
584 | content2 |
|
584 | content2 | |
585 |
|
585 | |||
586 | M missing_content2_content2_content4-tracked |
|
586 | M missing_content2_content2_content4-tracked | |
587 | <<<<<<< working copy: 0447570f1af6 - test: local |
|
587 | <<<<<<< working copy: 0447570f1af6 - test: local | |
588 | content4 |
|
588 | content4 | |
589 |
||||||| |
|
589 | ||||||| common ancestor: 000000000000 - : | |
590 | ======= |
|
590 | ======= | |
591 | content2 |
|
591 | content2 | |
592 | >>>>>>> merge rev: 85100b8c675b - test: remote |
|
592 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
593 |
|
593 | |||
594 | M missing_content2_content2_content4-untracked |
|
594 | M missing_content2_content2_content4-untracked | |
595 | content2 |
|
595 | content2 | |
@@ -607,23 +607,23 b' the remote side did not touch the file' | |||||
607 | content2 |
|
607 | content2 | |
608 |
|
608 | |||
609 | M missing_content2_content3_content3-tracked |
|
609 | M missing_content2_content3_content3-tracked | |
610 | <<<<<<< working copy: 0447570f1af6 - test: local |
|
610 | <<<<<<< working copy: 0447570f1af6 - test: local | |
611 | content3 |
|
611 | content3 | |
612 |
||||||| |
|
612 | ||||||| common ancestor: 000000000000 - : | |
613 | ======= |
|
613 | ======= | |
614 | content2 |
|
614 | content2 | |
615 | >>>>>>> merge rev: 85100b8c675b - test: remote |
|
615 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
616 |
|
616 | |||
617 | M missing_content2_content3_content3-untracked |
|
617 | M missing_content2_content3_content3-untracked | |
618 | content2 |
|
618 | content2 | |
619 |
|
619 | |||
620 | M missing_content2_content3_content4-tracked |
|
620 | M missing_content2_content3_content4-tracked | |
621 | <<<<<<< working copy: 0447570f1af6 - test: local |
|
621 | <<<<<<< working copy: 0447570f1af6 - test: local | |
622 | content4 |
|
622 | content4 | |
623 |
||||||| |
|
623 | ||||||| common ancestor: 000000000000 - : | |
624 | ======= |
|
624 | ======= | |
625 | content2 |
|
625 | content2 | |
626 | >>>>>>> merge rev: 85100b8c675b - test: remote |
|
626 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
627 |
|
627 | |||
628 | M missing_content2_content3_content4-untracked |
|
628 | M missing_content2_content3_content4-untracked | |
629 | content2 |
|
629 | content2 | |
@@ -641,20 +641,20 b' the remote side did not touch the file' | |||||
641 | content2 |
|
641 | content2 | |
642 |
|
642 | |||
643 | M missing_content2_missing_content4-tracked |
|
643 | M missing_content2_missing_content4-tracked | |
644 | <<<<<<< working copy: 0447570f1af6 - test: local |
|
644 | <<<<<<< working copy: 0447570f1af6 - test: local | |
645 | content4 |
|
645 | content4 | |
646 |
||||||| |
|
646 | ||||||| common ancestor: 000000000000 - : | |
647 | ======= |
|
647 | ======= | |
648 | content2 |
|
648 | content2 | |
649 | >>>>>>> merge rev: 85100b8c675b - test: remote |
|
649 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
650 |
|
650 | |||
651 | M missing_content2_missing_content4-untracked |
|
651 | M missing_content2_missing_content4-untracked | |
652 | <<<<<<< working copy: 0447570f1af6 - test: local |
|
652 | <<<<<<< working copy: 0447570f1af6 - test: local | |
653 | content4 |
|
653 | content4 | |
654 |
||||||| |
|
654 | ||||||| common ancestor: 000000000000 - : | |
655 | ======= |
|
655 | ======= | |
656 | content2 |
|
656 | content2 | |
657 | >>>>>>> merge rev: 85100b8c675b - test: remote |
|
657 | >>>>>>> merge rev: 85100b8c675b - test: remote | |
658 |
|
658 | |||
659 | M missing_content2_missing_missing-tracked |
|
659 | M missing_content2_missing_missing-tracked | |
660 | content2 |
|
660 | content2 |
@@ -1223,15 +1223,15 b' premerge=keep-merge3 keeps conflict mark' | |||||
1223 | # hg update -C 1 |
|
1223 | # hg update -C 1 | |
1224 | $ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3 |
|
1224 | $ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3 | |
1225 | merging f |
|
1225 | merging f | |
1226 | <<<<<<< working copy: ef83787e2614 - test: revision 1 |
|
1226 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
1227 | revision 1 |
|
1227 | revision 1 | |
1228 | space |
|
1228 | space | |
1229 |
||||||| |
|
1229 | ||||||| common ancestor: ffd2bda21d6e - test: revision 0 | |
1230 | revision 0 |
|
1230 | revision 0 | |
1231 | space |
|
1231 | space | |
1232 | ======= |
|
1232 | ======= | |
1233 | revision 4 |
|
1233 | revision 4 | |
1234 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
|
1234 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 | |
1235 | revision 0 |
|
1235 | revision 0 | |
1236 | space |
|
1236 | space | |
1237 | revision 4 |
|
1237 | revision 4 | |
@@ -1239,15 +1239,15 b' premerge=keep-merge3 keeps conflict mark' | |||||
1239 | (branch merge, don't forget to commit) |
|
1239 | (branch merge, don't forget to commit) | |
1240 | $ aftermerge |
|
1240 | $ aftermerge | |
1241 | # cat f |
|
1241 | # cat f | |
1242 | <<<<<<< working copy: ef83787e2614 - test: revision 1 |
|
1242 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
1243 | revision 1 |
|
1243 | revision 1 | |
1244 | space |
|
1244 | space | |
1245 |
||||||| |
|
1245 | ||||||| common ancestor: ffd2bda21d6e - test: revision 0 | |
1246 | revision 0 |
|
1246 | revision 0 | |
1247 | space |
|
1247 | space | |
1248 | ======= |
|
1248 | ======= | |
1249 | revision 4 |
|
1249 | revision 4 | |
1250 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
|
1250 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 | |
1251 | # hg stat |
|
1251 | # hg stat | |
1252 | M f |
|
1252 | M f | |
1253 | # hg resolve --list |
|
1253 | # hg resolve --list | |
@@ -1264,12 +1264,12 b' premerge=keep-mergediff keeps conflict m' | |||||
1264 | $ hg merge -r 4 --config merge-tools.true.premerge=keep-mergediff |
|
1264 | $ hg merge -r 4 --config merge-tools.true.premerge=keep-mergediff | |
1265 | merging f |
|
1265 | merging f | |
1266 | <<<<<<< |
|
1266 | <<<<<<< | |
1267 |
------- |
|
1267 | ------- common ancestor: ffd2bda21d6e - test: revision 0 | |
1268 | +++++++ working copy: ef83787e2614 - test: revision 1 |
|
1268 | +++++++ working copy: ef83787e2614 - test: revision 1 | |
1269 | -revision 0 |
|
1269 | -revision 0 | |
1270 | +revision 1 |
|
1270 | +revision 1 | |
1271 | space |
|
1271 | space | |
1272 | ======= merge rev: 81448d39c9a0 - test: revision 4 |
|
1272 | ======= merge rev: 81448d39c9a0 - test: revision 4 | |
1273 | revision 4 |
|
1273 | revision 4 | |
1274 | >>>>>>> |
|
1274 | >>>>>>> | |
1275 | revision 0 |
|
1275 | revision 0 | |
@@ -1280,12 +1280,12 b' premerge=keep-mergediff keeps conflict m' | |||||
1280 | $ aftermerge |
|
1280 | $ aftermerge | |
1281 | # cat f |
|
1281 | # cat f | |
1282 | <<<<<<< |
|
1282 | <<<<<<< | |
1283 |
------- |
|
1283 | ------- common ancestor: ffd2bda21d6e - test: revision 0 | |
1284 | +++++++ working copy: ef83787e2614 - test: revision 1 |
|
1284 | +++++++ working copy: ef83787e2614 - test: revision 1 | |
1285 | -revision 0 |
|
1285 | -revision 0 | |
1286 | +revision 1 |
|
1286 | +revision 1 | |
1287 | space |
|
1287 | space | |
1288 | ======= merge rev: 81448d39c9a0 - test: revision 4 |
|
1288 | ======= merge rev: 81448d39c9a0 - test: revision 4 | |
1289 | revision 4 |
|
1289 | revision 4 | |
1290 | >>>>>>> |
|
1290 | >>>>>>> | |
1291 | # hg stat |
|
1291 | # hg stat | |
@@ -1592,7 +1592,7 b' mergemarkertemplate settings:' | |||||
1592 | arg: "ll:working copy" |
|
1592 | arg: "ll:working copy" | |
1593 | arg: "lo:" |
|
1593 | arg: "lo:" | |
1594 | arg: "merge rev" |
|
1594 | arg: "merge rev" | |
1595 |
arg: "lb: |
|
1595 | arg: "lb:common ancestor: */f~base.*" (glob) | |
1596 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1596 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
1597 | (branch merge, don't forget to commit) |
|
1597 | (branch merge, don't forget to commit) | |
1598 | $ rm -f 'printargs_merge_tool' |
|
1598 | $ rm -f 'printargs_merge_tool' | |
@@ -1619,7 +1619,7 b' Same test with experimental.mergetempdir' | |||||
1619 | arg: "ll:working copy" |
|
1619 | arg: "ll:working copy" | |
1620 | arg: "lo:" |
|
1620 | arg: "lo:" | |
1621 | arg: "merge rev" |
|
1621 | arg: "merge rev" | |
1622 |
arg: "lb: |
|
1622 | arg: "lb:common ancestor: */hgmerge.*/f~base" (glob) | |
1623 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1623 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
1624 | (branch merge, don't forget to commit) |
|
1624 | (branch merge, don't forget to commit) | |
1625 | $ rm -f 'printargs_merge_tool' |
|
1625 | $ rm -f 'printargs_merge_tool' | |
@@ -1649,7 +1649,7 b' mergemarkertemplate:' | |||||
1649 | arg: "ll:working copy: tooltmpl ef83787e2614" |
|
1649 | arg: "ll:working copy: tooltmpl ef83787e2614" | |
1650 | arg: "lo:" |
|
1650 | arg: "lo:" | |
1651 | arg: "merge rev: tooltmpl 0185f4e0cf02" |
|
1651 | arg: "merge rev: tooltmpl 0185f4e0cf02" | |
1652 |
arg: "lb: |
|
1652 | arg: "lb:common ancestor: */f~base.*" (glob) | |
1653 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1653 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
1654 | (branch merge, don't forget to commit) |
|
1654 | (branch merge, don't forget to commit) | |
1655 | $ rm -f 'printargs_merge_tool' |
|
1655 | $ rm -f 'printargs_merge_tool' | |
@@ -2015,7 +2015,7 b' Check that the extra information is prin' | |||||
2015 | Running merge tool for b ("*/bin/echo.exe"): (glob) (windows !) |
|
2015 | Running merge tool for b ("*/bin/echo.exe"): (glob) (windows !) | |
2016 | Running merge tool for b (*/bin/echo): (glob) (no-windows !) |
|
2016 | Running merge tool for b (*/bin/echo): (glob) (no-windows !) | |
2017 | - local (working copy): 10:2d1f533d add binary file (#2) tip default |
|
2017 | - local (working copy): 10:2d1f533d add binary file (#2) tip default | |
2018 |
- |
|
2018 | - base (common ancestor): -1:00000000 default | |
2019 | - other (merge rev): 9:1e7ad7d7 add binary file (#1) default |
|
2019 | - other (merge rev): 9:1e7ad7d7 add binary file (#1) default | |
2020 | merge runs here ... |
|
2020 | merge runs here ... | |
2021 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
2021 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
@@ -211,11 +211,11 b' Verify rebase temporarily includes exclu' | |||||
211 | hide |
|
211 | hide | |
212 |
|
212 | |||
213 | $ cat hide |
|
213 | $ cat hide | |
214 |
<<<<<<< dest: |
|
214 | <<<<<<< dest: 39278f7c08a9 - test: two | |
215 | y |
|
215 | y | |
216 | ======= |
|
216 | ======= | |
217 | z |
|
217 | z | |
218 |
>>>>>>> source: |
|
218 | >>>>>>> source: b91df4f39e75 - test: edit hide | |
219 |
|
219 | |||
220 | Verify aborting a rebase cleans up temporary files |
|
220 | Verify aborting a rebase cleans up temporary files | |
221 |
|
221 |
General Comments 0
You need to be logged in to leave comments.
Login now