52 |
52 |
53 |
53 |
54 Non-interactive merge: |
54 Non-interactive merge: |
55 |
55 |
56 $ hg merge -y |
56 $ hg merge -y |
57 local changed file1 which remote deleted |
57 local changed file1 which other deleted |
58 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
58 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
59 remote changed file2 which local deleted |
59 other changed file2 which local deleted |
60 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
60 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
61 merging file3 |
61 merging file3 |
62 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
62 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
63 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
63 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
64 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
64 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
115 |
115 |
116 $ hg merge --config ui.interactive=true <<EOF |
116 $ hg merge --config ui.interactive=true <<EOF |
117 > c |
117 > c |
118 > d |
118 > d |
119 > EOF |
119 > EOF |
120 local changed file1 which remote deleted |
120 local changed file1 which other deleted |
121 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
121 use (c)hanged version, (d)elete, or leave (u)nresolved? c |
122 remote changed file2 which local deleted |
122 other changed file2 which local deleted |
123 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d |
123 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d |
124 merging file3 |
124 merging file3 |
125 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
125 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
126 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
126 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
127 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
127 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
179 > bar |
179 > bar |
180 > d |
180 > d |
181 > baz |
181 > baz |
182 > c |
182 > c |
183 > EOF |
183 > EOF |
184 local changed file1 which remote deleted |
184 local changed file1 which other deleted |
185 use (c)hanged version, (d)elete, or leave (u)nresolved? foo |
185 use (c)hanged version, (d)elete, or leave (u)nresolved? foo |
186 unrecognized response |
186 unrecognized response |
187 local changed file1 which remote deleted |
187 local changed file1 which other deleted |
188 use (c)hanged version, (d)elete, or leave (u)nresolved? bar |
188 use (c)hanged version, (d)elete, or leave (u)nresolved? bar |
189 unrecognized response |
189 unrecognized response |
190 local changed file1 which remote deleted |
190 local changed file1 which other deleted |
191 use (c)hanged version, (d)elete, or leave (u)nresolved? d |
191 use (c)hanged version, (d)elete, or leave (u)nresolved? d |
192 remote changed file2 which local deleted |
192 other changed file2 which local deleted |
193 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz |
193 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz |
194 unrecognized response |
194 unrecognized response |
195 remote changed file2 which local deleted |
195 other changed file2 which local deleted |
196 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
196 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
197 merging file3 |
197 merging file3 |
198 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
198 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
199 0 files updated, 1 files merged, 1 files removed, 1 files unresolved |
199 0 files updated, 1 files merged, 1 files removed, 1 files unresolved |
200 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
200 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
248 1 other heads for branch "default" |
248 1 other heads for branch "default" |
249 |
249 |
250 $ hg merge --config ui.interactive=true <<EOF |
250 $ hg merge --config ui.interactive=true <<EOF |
251 > d |
251 > d |
252 > EOF |
252 > EOF |
253 local changed file1 which remote deleted |
253 local changed file1 which other deleted |
254 use (c)hanged version, (d)elete, or leave (u)nresolved? d |
254 use (c)hanged version, (d)elete, or leave (u)nresolved? d |
255 remote changed file2 which local deleted |
255 other changed file2 which local deleted |
256 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
256 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
257 merging file3 |
257 merging file3 |
258 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
258 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
259 0 files updated, 0 files merged, 1 files removed, 2 files unresolved |
259 0 files updated, 0 files merged, 1 files removed, 2 files unresolved |
260 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
260 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
443 $ hg co -C |
443 $ hg co -C |
444 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
444 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
445 1 other heads for branch "default" |
445 1 other heads for branch "default" |
446 |
446 |
447 $ hg merge --config ui.interactive=True --tool :prompt |
447 $ hg merge --config ui.interactive=True --tool :prompt |
448 local changed file1 which remote deleted |
448 local changed file1 which other deleted |
449 use (c)hanged version, (d)elete, or leave (u)nresolved? |
449 use (c)hanged version, (d)elete, or leave (u)nresolved? |
450 remote changed file2 which local deleted |
450 other changed file2 which local deleted |
451 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
451 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
452 no tool found to merge file3 |
452 no tool found to merge file3 |
453 keep (l)ocal, take (o)ther, or leave (u)nresolved? |
453 keep (l)ocal, take (o)ther, or leave (u)nresolved? |
454 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
454 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
455 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
455 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
499 $ hg co -C |
499 $ hg co -C |
500 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
500 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
501 1 other heads for branch "default" |
501 1 other heads for branch "default" |
502 |
502 |
503 $ hg merge --tool :prompt |
503 $ hg merge --tool :prompt |
504 local changed file1 which remote deleted |
504 local changed file1 which other deleted |
505 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
505 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
506 remote changed file2 which local deleted |
506 other changed file2 which local deleted |
507 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
507 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
508 no tool found to merge file3 |
508 no tool found to merge file3 |
509 keep (l)ocal, take (o)ther, or leave (u)nresolved? u |
509 keep (l)ocal, take (o)ther, or leave (u)nresolved? u |
510 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
510 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
511 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
511 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
553 $ hg co -C |
553 $ hg co -C |
554 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
554 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
555 1 other heads for branch "default" |
555 1 other heads for branch "default" |
556 |
556 |
557 $ hg merge --tool :merge3 |
557 $ hg merge --tool :merge3 |
558 local changed file1 which remote deleted |
558 local changed file1 which other deleted |
559 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
559 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
560 remote changed file2 which local deleted |
560 other changed file2 which local deleted |
561 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
561 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
562 merging file3 |
562 merging file3 |
563 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
563 warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
564 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
564 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
565 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
565 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
640 (no more unresolved files) |
640 (no more unresolved files) |
641 --- diff of status --- |
641 --- diff of status --- |
642 (status identical) |
642 (status identical) |
643 |
643 |
644 === :other -> :prompt === |
644 === :other -> :prompt === |
645 local changed file1 which remote deleted |
645 local changed file1 which other deleted |
646 use (c)hanged version, (d)elete, or leave (u)nresolved? |
646 use (c)hanged version, (d)elete, or leave (u)nresolved? |
647 remote changed file2 which local deleted |
647 other changed file2 which local deleted |
648 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
648 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
649 no tool found to merge file3 |
649 no tool found to merge file3 |
650 keep (l)ocal, take (o)ther, or leave (u)nresolved? |
650 keep (l)ocal, take (o)ther, or leave (u)nresolved? |
651 --- diff of status --- |
651 --- diff of status --- |
652 (status identical) |
652 (status identical) |
669 (no more unresolved files) |
669 (no more unresolved files) |
670 --- diff of status --- |
670 --- diff of status --- |
671 (status identical) |
671 (status identical) |
672 |
672 |
673 === :local -> :prompt === |
673 === :local -> :prompt === |
674 local changed file1 which remote deleted |
674 local changed file1 which other deleted |
675 use (c)hanged version, (d)elete, or leave (u)nresolved? |
675 use (c)hanged version, (d)elete, or leave (u)nresolved? |
676 remote changed file2 which local deleted |
676 other changed file2 which local deleted |
677 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
677 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
678 no tool found to merge file3 |
678 no tool found to merge file3 |
679 keep (l)ocal, take (o)ther, or leave (u)nresolved? |
679 keep (l)ocal, take (o)ther, or leave (u)nresolved? |
680 --- diff of status --- |
680 --- diff of status --- |
681 (status identical) |
681 (status identical) |
688 === :other -> :fail === |
688 === :other -> :fail === |
689 --- diff of status --- |
689 --- diff of status --- |
690 (status identical) |
690 (status identical) |
691 |
691 |
692 === :fail -> :prompt === |
692 === :fail -> :prompt === |
693 local changed file1 which remote deleted |
693 local changed file1 which other deleted |
694 use (c)hanged version, (d)elete, or leave (u)nresolved? |
694 use (c)hanged version, (d)elete, or leave (u)nresolved? |
695 remote changed file2 which local deleted |
695 other changed file2 which local deleted |
696 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
696 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
697 no tool found to merge file3 |
697 no tool found to merge file3 |
698 keep (l)ocal, take (o)ther, or leave (u)nresolved? |
698 keep (l)ocal, take (o)ther, or leave (u)nresolved? |
699 --- diff of status --- |
699 --- diff of status --- |
700 (status identical) |
700 (status identical) |
715 $ hg co -C 0 |
715 $ hg co -C 0 |
716 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
716 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
717 $ echo changed >> file1 |
717 $ echo changed >> file1 |
718 $ hg rm file2 |
718 $ hg rm file2 |
719 $ hg update 1 -y |
719 $ hg update 1 -y |
720 local [working copy] changed file1 which remote [destination] deleted |
720 local [working copy] changed file1 which other [destination] deleted |
721 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
721 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
722 remote [destination] changed file2 which local [working copy] deleted |
722 other [destination] changed file2 which local [working copy] deleted |
723 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
723 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
724 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
724 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
725 use 'hg resolve' to retry unresolved file merges |
725 use 'hg resolve' to retry unresolved file merges |
726 [1] |
726 [1] |
727 $ status |
727 $ status |
891 $ hg co -C 0 |
891 $ hg co -C 0 |
892 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
892 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
893 $ echo changed >> file1 |
893 $ echo changed >> file1 |
894 $ hg rm file2 |
894 $ hg rm file2 |
895 $ hg update 1 --config ui.interactive=True --tool :prompt |
895 $ hg update 1 --config ui.interactive=True --tool :prompt |
896 local [working copy] changed file1 which remote [destination] deleted |
896 local [working copy] changed file1 which other [destination] deleted |
897 use (c)hanged version, (d)elete, or leave (u)nresolved? |
897 use (c)hanged version, (d)elete, or leave (u)nresolved? |
898 remote [destination] changed file2 which local [working copy] deleted |
898 other [destination] changed file2 which local [working copy] deleted |
899 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
899 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
900 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
900 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
901 use 'hg resolve' to retry unresolved file merges |
901 use 'hg resolve' to retry unresolved file merges |
902 [1] |
902 [1] |
903 $ status 2>&1 | tee $TESTTMP/prompt.status |
903 $ status 2>&1 | tee $TESTTMP/prompt.status |
941 $ hg co -C 0 |
941 $ hg co -C 0 |
942 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
942 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
943 $ echo changed >> file1 |
943 $ echo changed >> file1 |
944 $ hg rm file2 |
944 $ hg rm file2 |
945 $ hg update 1 --tool :merge3 |
945 $ hg update 1 --tool :merge3 |
946 local [working copy] changed file1 which remote [destination] deleted |
946 local [working copy] changed file1 which other [destination] deleted |
947 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
947 use (c)hanged version, (d)elete, or leave (u)nresolved? u |
948 remote [destination] changed file2 which local [working copy] deleted |
948 other [destination] changed file2 which local [working copy] deleted |
949 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
949 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
950 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
950 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
951 use 'hg resolve' to retry unresolved file merges |
951 use 'hg resolve' to retry unresolved file merges |
952 [1] |
952 [1] |
953 $ status |
953 $ status |
997 (no more unresolved files) |
997 (no more unresolved files) |
998 --- diff of status --- |
998 --- diff of status --- |
999 (status identical) |
999 (status identical) |
1000 |
1000 |
1001 === :other -> :prompt === |
1001 === :other -> :prompt === |
1002 local [working copy] changed file1 which remote [destination] deleted |
1002 local [working copy] changed file1 which other [destination] deleted |
1003 use (c)hanged version, (d)elete, or leave (u)nresolved? |
1003 use (c)hanged version, (d)elete, or leave (u)nresolved? |
1004 remote [destination] changed file2 which local [working copy] deleted |
1004 other [destination] changed file2 which local [working copy] deleted |
1005 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
1005 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
1006 --- diff of status --- |
1006 --- diff of status --- |
1007 (status identical) |
1007 (status identical) |
1008 |
1008 |
1009 === :prompt -> :local === |
1009 === :prompt -> :local === |
1024 (no more unresolved files) |
1024 (no more unresolved files) |
1025 --- diff of status --- |
1025 --- diff of status --- |
1026 (status identical) |
1026 (status identical) |
1027 |
1027 |
1028 === :local -> :prompt === |
1028 === :local -> :prompt === |
1029 local [working copy] changed file1 which remote [destination] deleted |
1029 local [working copy] changed file1 which other [destination] deleted |
1030 use (c)hanged version, (d)elete, or leave (u)nresolved? |
1030 use (c)hanged version, (d)elete, or leave (u)nresolved? |
1031 remote [destination] changed file2 which local [working copy] deleted |
1031 other [destination] changed file2 which local [working copy] deleted |
1032 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
1032 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
1033 --- diff of status --- |
1033 --- diff of status --- |
1034 (status identical) |
1034 (status identical) |
1035 |
1035 |
1036 === :prompt -> :other === |
1036 === :prompt -> :other === |
1041 === :other -> :fail === |
1041 === :other -> :fail === |
1042 --- diff of status --- |
1042 --- diff of status --- |
1043 (status identical) |
1043 (status identical) |
1044 |
1044 |
1045 === :fail -> :prompt === |
1045 === :fail -> :prompt === |
1046 local [working copy] changed file1 which remote [destination] deleted |
1046 local [working copy] changed file1 which other [destination] deleted |
1047 use (c)hanged version, (d)elete, or leave (u)nresolved? |
1047 use (c)hanged version, (d)elete, or leave (u)nresolved? |
1048 remote [destination] changed file2 which local [working copy] deleted |
1048 other [destination] changed file2 which local [working copy] deleted |
1049 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
1049 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
1050 --- diff of status --- |
1050 --- diff of status --- |
1051 (status identical) |
1051 (status identical) |
1052 |
1052 |
1053 === :prompt -> :fail === |
1053 === :prompt -> :fail === |