Show More
@@ -240,14 +240,14 b' def _iprompt(repo, mynode, orig, fcd, fc' | |||||
240 | index = ui.promptchoice( |
|
240 | index = ui.promptchoice( | |
241 | _("local changed %s which remote deleted\n" |
|
241 | _("local changed %s which remote deleted\n" | |
242 | "use (c)hanged version, (d)elete, or leave (u)nresolved?" |
|
242 | "use (c)hanged version, (d)elete, or leave (u)nresolved?" | |
243 |
"$$ &Changed $$ &Delete $$ &Unresolved") % fd, |
|
243 | "$$ &Changed $$ &Delete $$ &Unresolved") % fd, 2) | |
244 | choice = ['local', 'other', 'unresolved'][index] |
|
244 | choice = ['local', 'other', 'unresolved'][index] | |
245 | elif fcd.isabsent(): |
|
245 | elif fcd.isabsent(): | |
246 | index = ui.promptchoice( |
|
246 | index = ui.promptchoice( | |
247 | _("remote changed %s which local deleted\n" |
|
247 | _("remote changed %s which local deleted\n" | |
248 | "use (c)hanged version, leave (d)eleted, or " |
|
248 | "use (c)hanged version, leave (d)eleted, or " | |
249 | "leave (u)nresolved?" |
|
249 | "leave (u)nresolved?" | |
250 |
"$$ &Changed $$ &Deleted $$ &Unresolved") % fd, |
|
250 | "$$ &Changed $$ &Deleted $$ &Unresolved") % fd, 2) | |
251 | choice = ['other', 'local', 'unresolved'][index] |
|
251 | choice = ['other', 'local', 'unresolved'][index] | |
252 | else: |
|
252 | else: | |
253 | index = ui.promptchoice( |
|
253 | index = ui.promptchoice( |
@@ -55,12 +55,12 b' 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 remote deleted | |
58 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
58 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
59 | remote changed file2 which local deleted |
|
59 | remote changed file2 which local deleted | |
60 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
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, |
|
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 | |
65 | [1] |
|
65 | [1] | |
66 |
|
66 | |||
@@ -70,18 +70,18 b' Non-interactive merge:' | |||||
70 | M file3 |
|
70 | M file3 | |
71 | C file1 |
|
71 | C file1 | |
72 | --- resolve --list --- |
|
72 | --- resolve --list --- | |
73 |
|
|
73 | U file1 | |
74 |
|
|
74 | U file2 | |
75 | U file3 |
|
75 | U file3 | |
76 | --- debugmergestate --- |
|
76 | --- debugmergestate --- | |
77 | * version 2 records |
|
77 | * version 2 records | |
78 | local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
|
78 | local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 | |
79 | other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
79 | other: 10f9a0a634e82080907e62f075ab119cbc565ea6 | |
80 |
file: file1 (record type "C", state " |
|
80 | file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) | |
81 | local path: file1 (flags "") |
|
81 | local path: file1 (flags "") | |
82 | ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
|
82 | ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | |
83 | other path: file1 (node null) |
|
83 | other path: file1 (node null) | |
84 |
file: file2 (record type "C", state " |
|
84 | file: file2 (record type "C", state "u", hash null) | |
85 | local path: file2 (flags "") |
|
85 | local path: file2 (flags "") | |
86 | ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
|
86 | ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | |
87 | other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
|
87 | other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | |
@@ -470,12 +470,12 b' Force prompts' | |||||
470 |
|
470 | |||
471 | $ hg merge --tool :prompt |
|
471 | $ hg merge --tool :prompt | |
472 | local changed file1 which remote deleted |
|
472 | local changed file1 which remote deleted | |
473 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
473 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
474 | remote changed file2 which local deleted |
|
474 | remote changed file2 which local deleted | |
475 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
475 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
476 | no tool found to merge file3 |
|
476 | no tool found to merge file3 | |
477 | keep (l)ocal, take (o)ther, or leave (u)nresolved? u |
|
477 | keep (l)ocal, take (o)ther, or leave (u)nresolved? u | |
478 |
0 files updated, |
|
478 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved | |
479 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
479 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
480 | [1] |
|
480 | [1] | |
481 | $ status |
|
481 | $ status | |
@@ -484,18 +484,18 b' Force prompts' | |||||
484 | M file3 |
|
484 | M file3 | |
485 | C file1 |
|
485 | C file1 | |
486 | --- resolve --list --- |
|
486 | --- resolve --list --- | |
487 |
|
|
487 | U file1 | |
488 |
|
|
488 | U file2 | |
489 | U file3 |
|
489 | U file3 | |
490 | --- debugmergestate --- |
|
490 | --- debugmergestate --- | |
491 | * version 2 records |
|
491 | * version 2 records | |
492 | local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
|
492 | local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 | |
493 | other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
493 | other: 10f9a0a634e82080907e62f075ab119cbc565ea6 | |
494 |
file: file1 (record type "C", state " |
|
494 | file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) | |
495 | local path: file1 (flags "") |
|
495 | local path: file1 (flags "") | |
496 | ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
|
496 | ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | |
497 | other path: file1 (node null) |
|
497 | other path: file1 (node null) | |
498 |
file: file2 (record type "C", state " |
|
498 | file: file2 (record type "C", state "u", hash null) | |
499 | local path: file2 (flags "") |
|
499 | local path: file2 (flags "") | |
500 | ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
|
500 | ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | |
501 | other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
|
501 | other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | |
@@ -520,12 +520,12 b' Choose to merge all files' | |||||
520 |
|
520 | |||
521 | $ hg merge --tool :merge3 |
|
521 | $ hg merge --tool :merge3 | |
522 | local changed file1 which remote deleted |
|
522 | local changed file1 which remote deleted | |
523 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
523 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
524 | remote changed file2 which local deleted |
|
524 | remote changed file2 which local deleted | |
525 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
525 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
526 | merging file3 |
|
526 | merging file3 | |
527 | warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
|
527 | warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') | |
528 |
0 files updated, |
|
528 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved | |
529 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
529 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
530 | [1] |
|
530 | [1] | |
531 | $ status |
|
531 | $ status | |
@@ -534,18 +534,18 b' Choose to merge all files' | |||||
534 | M file3 |
|
534 | M file3 | |
535 | C file1 |
|
535 | C file1 | |
536 | --- resolve --list --- |
|
536 | --- resolve --list --- | |
537 |
|
|
537 | U file1 | |
538 |
|
|
538 | U file2 | |
539 | U file3 |
|
539 | U file3 | |
540 | --- debugmergestate --- |
|
540 | --- debugmergestate --- | |
541 | * version 2 records |
|
541 | * version 2 records | |
542 | local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
|
542 | local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 | |
543 | other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
543 | other: 10f9a0a634e82080907e62f075ab119cbc565ea6 | |
544 |
file: file1 (record type "C", state " |
|
544 | file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) | |
545 | local path: file1 (flags "") |
|
545 | local path: file1 (flags "") | |
546 | ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
|
546 | ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | |
547 | other path: file1 (node null) |
|
547 | other path: file1 (node null) | |
548 |
file: file2 (record type "C", state " |
|
548 | file: file2 (record type "C", state "u", hash null) | |
549 | local path: file2 (flags "") |
|
549 | local path: file2 (flags "") | |
550 | ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
|
550 | ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | |
551 | other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
|
551 | other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | |
@@ -679,27 +679,29 b' Non-interactive linear update' | |||||
679 | $ hg rm file2 |
|
679 | $ hg rm file2 | |
680 | $ hg update 1 -y |
|
680 | $ hg update 1 -y | |
681 | local changed file1 which remote deleted |
|
681 | local changed file1 which remote deleted | |
682 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
682 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
683 | remote changed file2 which local deleted |
|
683 | remote changed file2 which local deleted | |
684 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
684 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
685 |
1 files updated, |
|
685 | 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | |
|
686 | use 'hg resolve' to retry unresolved file merges | |||
|
687 | [1] | |||
686 | $ status |
|
688 | $ status | |
687 | --- status --- |
|
689 | --- status --- | |
688 | A file1 |
|
690 | A file1 | |
689 | C file2 |
|
691 | C file2 | |
690 | C file3 |
|
692 | C file3 | |
691 | --- resolve --list --- |
|
693 | --- resolve --list --- | |
692 |
|
|
694 | U file1 | |
693 |
|
|
695 | U file2 | |
694 | --- debugmergestate --- |
|
696 | --- debugmergestate --- | |
695 | * version 2 records |
|
697 | * version 2 records | |
696 | local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
|
698 | local: ab57bf49aa276a22d35a473592d4c34b5abc3eff | |
697 | other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
699 | other: 10f9a0a634e82080907e62f075ab119cbc565ea6 | |
698 |
file: file1 (record type "C", state " |
|
700 | file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) | |
699 | local path: file1 (flags "") |
|
701 | local path: file1 (flags "") | |
700 | ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
|
702 | ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | |
701 | other path: file1 (node null) |
|
703 | other path: file1 (node null) | |
702 |
file: file2 (record type "C", state " |
|
704 | file: file2 (record type "C", state "u", hash null) | |
703 | local path: file2 (flags "") |
|
705 | local path: file2 (flags "") | |
704 | ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
|
706 | ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | |
705 | other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
|
707 | other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | |
@@ -878,27 +880,29 b' Choose to merge all files' | |||||
878 | $ hg rm file2 |
|
880 | $ hg rm file2 | |
879 | $ hg update 1 --tool :merge3 |
|
881 | $ hg update 1 --tool :merge3 | |
880 | local changed file1 which remote deleted |
|
882 | local changed file1 which remote deleted | |
881 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
883 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
882 | remote changed file2 which local deleted |
|
884 | remote changed file2 which local deleted | |
883 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
885 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
884 |
1 files updated, |
|
886 | 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | |
|
887 | use 'hg resolve' to retry unresolved file merges | |||
|
888 | [1] | |||
885 | $ status |
|
889 | $ status | |
886 | --- status --- |
|
890 | --- status --- | |
887 | A file1 |
|
891 | A file1 | |
888 | C file2 |
|
892 | C file2 | |
889 | C file3 |
|
893 | C file3 | |
890 | --- resolve --list --- |
|
894 | --- resolve --list --- | |
891 |
|
|
895 | U file1 | |
892 |
|
|
896 | U file2 | |
893 | --- debugmergestate --- |
|
897 | --- debugmergestate --- | |
894 | * version 2 records |
|
898 | * version 2 records | |
895 | local: ab57bf49aa276a22d35a473592d4c34b5abc3eff |
|
899 | local: ab57bf49aa276a22d35a473592d4c34b5abc3eff | |
896 | other: 10f9a0a634e82080907e62f075ab119cbc565ea6 |
|
900 | other: 10f9a0a634e82080907e62f075ab119cbc565ea6 | |
897 |
file: file1 (record type "C", state " |
|
901 | file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390) | |
898 | local path: file1 (flags "") |
|
902 | local path: file1 (flags "") | |
899 | ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
|
903 | ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | |
900 | other path: file1 (node null) |
|
904 | other path: file1 (node null) | |
901 |
file: file2 (record type "C", state " |
|
905 | file: file2 (record type "C", state "u", hash null) | |
902 | local path: file2 (flags "") |
|
906 | local path: file2 (flags "") | |
903 | ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
|
907 | ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | |
904 | other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
|
908 | other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
@@ -143,55 +143,55 b' Merge with remote' | |||||
143 |
|
143 | |||
144 | $ hg merge -f --tool internal:merge3 'desc("remote")' |
|
144 | $ hg merge -f --tool internal:merge3 'desc("remote")' | |
145 | local changed content1_missing_content1_content4-tracked which remote deleted |
|
145 | local changed content1_missing_content1_content4-tracked which remote deleted | |
146 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
146 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
147 | local changed content1_missing_content3_content3-tracked which remote deleted |
|
147 | local changed content1_missing_content3_content3-tracked which remote deleted | |
148 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
148 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
149 | local changed content1_missing_content3_content4-tracked which remote deleted |
|
149 | local changed content1_missing_content3_content4-tracked which remote deleted | |
150 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
150 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
151 | local changed content1_missing_missing_content4-tracked which remote deleted |
|
151 | local changed content1_missing_missing_content4-tracked which remote deleted | |
152 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
152 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
153 | remote changed content1_content2_content1_content1-untracked which local deleted |
|
153 | remote changed content1_content2_content1_content1-untracked which local deleted | |
154 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
154 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
155 | remote changed content1_content2_content1_content2-untracked which local deleted |
|
155 | remote changed content1_content2_content1_content2-untracked which local deleted | |
156 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
156 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
157 | remote changed content1_content2_content1_content4-untracked which local deleted |
|
157 | remote changed content1_content2_content1_content4-untracked which local deleted | |
158 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
158 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
159 | remote changed content1_content2_content1_missing-tracked which local deleted |
|
159 | remote changed content1_content2_content1_missing-tracked which local deleted | |
160 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
160 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
161 | remote changed content1_content2_content1_missing-untracked which local deleted |
|
161 | remote changed content1_content2_content1_missing-untracked which local deleted | |
162 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
162 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
163 | remote changed content1_content2_content2_content1-untracked which local deleted |
|
163 | remote changed content1_content2_content2_content1-untracked which local deleted | |
164 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
164 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
165 | remote changed content1_content2_content2_content2-untracked which local deleted |
|
165 | remote changed content1_content2_content2_content2-untracked which local deleted | |
166 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
166 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
167 | remote changed content1_content2_content2_content4-untracked which local deleted |
|
167 | remote changed content1_content2_content2_content4-untracked which local deleted | |
168 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
168 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
169 | remote changed content1_content2_content2_missing-tracked which local deleted |
|
169 | remote changed content1_content2_content2_missing-tracked which local deleted | |
170 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
170 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
171 | remote changed content1_content2_content2_missing-untracked which local deleted |
|
171 | remote changed content1_content2_content2_missing-untracked which local deleted | |
172 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
172 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
173 | remote changed content1_content2_content3_content1-untracked which local deleted |
|
173 | remote changed content1_content2_content3_content1-untracked which local deleted | |
174 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
174 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
175 | remote changed content1_content2_content3_content2-untracked which local deleted |
|
175 | remote changed content1_content2_content3_content2-untracked which local deleted | |
176 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
176 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
177 | remote changed content1_content2_content3_content3-untracked which local deleted |
|
177 | remote changed content1_content2_content3_content3-untracked which local deleted | |
178 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
178 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
179 | remote changed content1_content2_content3_content4-untracked which local deleted |
|
179 | remote changed content1_content2_content3_content4-untracked which local deleted | |
180 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
180 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
181 | remote changed content1_content2_content3_missing-tracked which local deleted |
|
181 | remote changed content1_content2_content3_missing-tracked which local deleted | |
182 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
182 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
183 | remote changed content1_content2_content3_missing-untracked which local deleted |
|
183 | remote changed content1_content2_content3_missing-untracked which local deleted | |
184 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
184 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
185 | remote changed content1_content2_missing_content1-untracked which local deleted |
|
185 | remote changed content1_content2_missing_content1-untracked which local deleted | |
186 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
186 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
187 | remote changed content1_content2_missing_content2-untracked which local deleted |
|
187 | remote changed content1_content2_missing_content2-untracked which local deleted | |
188 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
188 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
189 | remote changed content1_content2_missing_content4-untracked which local deleted |
|
189 | remote changed content1_content2_missing_content4-untracked which local deleted | |
190 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
190 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
191 | remote changed content1_content2_missing_missing-tracked which local deleted |
|
191 | remote changed content1_content2_missing_missing-tracked which local deleted | |
192 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
192 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
193 | remote changed content1_content2_missing_missing-untracked which local deleted |
|
193 | remote changed content1_content2_missing_missing-untracked which local deleted | |
194 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
194 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
195 | merging content1_content2_content1_content4-tracked |
|
195 | merging content1_content2_content1_content4-tracked | |
196 | merging content1_content2_content2_content1-tracked |
|
196 | merging content1_content2_content2_content1-tracked | |
197 | merging content1_content2_content2_content4-tracked |
|
197 | merging content1_content2_content2_content4-tracked | |
@@ -215,7 +215,7 b' Merge with remote' | |||||
215 | warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
|
215 | warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') | |
216 | warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
|
216 | warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') | |
217 | warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') |
|
217 | warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') | |
218 |
18 files updated, |
|
218 | 18 files updated, 3 files merged, 8 files removed, 35 files unresolved | |
219 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
219 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
220 | [1] |
|
220 | [1] | |
221 |
|
221 | |||
@@ -227,39 +227,39 b' Interestingly, one untracked file got me' | |||||
227 | odd 'if force and branchmerge and different' case in manifestmerge(). |
|
227 | odd 'if force and branchmerge and different' case in manifestmerge(). | |
228 |
|
228 | |||
229 | $ hg resolve -l |
|
229 | $ hg resolve -l | |
230 |
|
|
230 | U content1_content2_content1_content1-untracked | |
231 |
|
|
231 | U content1_content2_content1_content2-untracked | |
232 | U content1_content2_content1_content4-tracked |
|
232 | U content1_content2_content1_content4-tracked | |
233 |
|
|
233 | U content1_content2_content1_content4-untracked | |
234 |
|
|
234 | U content1_content2_content1_missing-tracked | |
235 |
|
|
235 | U content1_content2_content1_missing-untracked | |
236 | R content1_content2_content2_content1-tracked |
|
236 | R content1_content2_content2_content1-tracked | |
237 |
|
|
237 | U content1_content2_content2_content1-untracked | |
238 |
|
|
238 | U content1_content2_content2_content2-untracked | |
239 | U content1_content2_content2_content4-tracked |
|
239 | U content1_content2_content2_content4-tracked | |
240 |
|
|
240 | U content1_content2_content2_content4-untracked | |
241 |
|
|
241 | U content1_content2_content2_missing-tracked | |
242 |
|
|
242 | U content1_content2_content2_missing-untracked | |
243 | R content1_content2_content3_content1-tracked |
|
243 | R content1_content2_content3_content1-tracked | |
244 |
|
|
244 | U content1_content2_content3_content1-untracked | |
245 |
|
|
245 | U content1_content2_content3_content2-untracked | |
246 | U content1_content2_content3_content3-tracked |
|
246 | U content1_content2_content3_content3-tracked | |
247 |
|
|
247 | U content1_content2_content3_content3-untracked | |
248 | U content1_content2_content3_content4-tracked |
|
248 | U content1_content2_content3_content4-tracked | |
249 |
|
|
249 | U content1_content2_content3_content4-untracked | |
250 |
|
|
250 | U content1_content2_content3_missing-tracked | |
251 |
|
|
251 | U content1_content2_content3_missing-untracked | |
252 | R content1_content2_missing_content1-tracked |
|
252 | R content1_content2_missing_content1-tracked | |
253 |
|
|
253 | U content1_content2_missing_content1-untracked | |
254 |
|
|
254 | U content1_content2_missing_content2-untracked | |
255 | U content1_content2_missing_content4-tracked |
|
255 | U content1_content2_missing_content4-tracked | |
256 |
|
|
256 | U content1_content2_missing_content4-untracked | |
257 |
|
|
257 | U content1_content2_missing_missing-tracked | |
258 |
|
|
258 | U content1_content2_missing_missing-untracked | |
259 |
|
|
259 | U content1_missing_content1_content4-tracked | |
260 |
|
|
260 | U content1_missing_content3_content3-tracked | |
261 |
|
|
261 | U content1_missing_content3_content4-tracked | |
262 |
|
|
262 | U content1_missing_missing_content4-tracked | |
263 | U missing_content2_content2_content4-tracked |
|
263 | U missing_content2_content2_content4-tracked | |
264 | U missing_content2_content3_content3-tracked |
|
264 | U missing_content2_content3_content3-tracked | |
265 | U missing_content2_content3_content4-tracked |
|
265 | U missing_content2_content3_content4-tracked | |
@@ -705,63 +705,63 b' Re-resolve and check status' | |||||
705 | $ hg resolve --unmark --all |
|
705 | $ hg resolve --unmark --all | |
706 | $ hg resolve --all --tool internal:merge3 |
|
706 | $ hg resolve --all --tool internal:merge3 | |
707 | remote changed content1_content2_content1_content1-untracked which local deleted |
|
707 | remote changed content1_content2_content1_content1-untracked which local deleted | |
708 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
708 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
709 | remote changed content1_content2_content1_content2-untracked which local deleted |
|
709 | remote changed content1_content2_content1_content2-untracked which local deleted | |
710 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
710 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
711 | merging content1_content2_content1_content4-tracked |
|
711 | merging content1_content2_content1_content4-tracked | |
712 | remote changed content1_content2_content1_content4-untracked which local deleted |
|
712 | remote changed content1_content2_content1_content4-untracked which local deleted | |
713 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
713 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
714 | remote changed content1_content2_content1_missing-tracked which local deleted |
|
714 | remote changed content1_content2_content1_missing-tracked which local deleted | |
715 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
715 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
716 | remote changed content1_content2_content1_missing-untracked which local deleted |
|
716 | remote changed content1_content2_content1_missing-untracked which local deleted | |
717 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
717 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
718 | merging content1_content2_content2_content1-tracked |
|
718 | merging content1_content2_content2_content1-tracked | |
719 | remote changed content1_content2_content2_content1-untracked which local deleted |
|
719 | remote changed content1_content2_content2_content1-untracked which local deleted | |
720 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
720 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
721 | remote changed content1_content2_content2_content2-untracked which local deleted |
|
721 | remote changed content1_content2_content2_content2-untracked which local deleted | |
722 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
722 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
723 | merging content1_content2_content2_content4-tracked |
|
723 | merging content1_content2_content2_content4-tracked | |
724 | remote changed content1_content2_content2_content4-untracked which local deleted |
|
724 | remote changed content1_content2_content2_content4-untracked which local deleted | |
725 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
725 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
726 | remote changed content1_content2_content2_missing-tracked which local deleted |
|
726 | remote changed content1_content2_content2_missing-tracked which local deleted | |
727 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
727 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
728 | remote changed content1_content2_content2_missing-untracked which local deleted |
|
728 | remote changed content1_content2_content2_missing-untracked which local deleted | |
729 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
729 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
730 | merging content1_content2_content3_content1-tracked |
|
730 | merging content1_content2_content3_content1-tracked | |
731 | remote changed content1_content2_content3_content1-untracked which local deleted |
|
731 | remote changed content1_content2_content3_content1-untracked which local deleted | |
732 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
732 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
733 | remote changed content1_content2_content3_content2-untracked which local deleted |
|
733 | remote changed content1_content2_content3_content2-untracked which local deleted | |
734 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
734 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
735 | merging content1_content2_content3_content3-tracked |
|
735 | merging content1_content2_content3_content3-tracked | |
736 | remote changed content1_content2_content3_content3-untracked which local deleted |
|
736 | remote changed content1_content2_content3_content3-untracked which local deleted | |
737 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
737 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
738 | merging content1_content2_content3_content4-tracked |
|
738 | merging content1_content2_content3_content4-tracked | |
739 | remote changed content1_content2_content3_content4-untracked which local deleted |
|
739 | remote changed content1_content2_content3_content4-untracked which local deleted | |
740 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
740 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
741 | remote changed content1_content2_content3_missing-tracked which local deleted |
|
741 | remote changed content1_content2_content3_missing-tracked which local deleted | |
742 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
742 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
743 | remote changed content1_content2_content3_missing-untracked which local deleted |
|
743 | remote changed content1_content2_content3_missing-untracked which local deleted | |
744 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
744 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
745 | merging content1_content2_missing_content1-tracked |
|
745 | merging content1_content2_missing_content1-tracked | |
746 | remote changed content1_content2_missing_content1-untracked which local deleted |
|
746 | remote changed content1_content2_missing_content1-untracked which local deleted | |
747 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
747 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
748 | remote changed content1_content2_missing_content2-untracked which local deleted |
|
748 | remote changed content1_content2_missing_content2-untracked which local deleted | |
749 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
749 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
750 | merging content1_content2_missing_content4-tracked |
|
750 | merging content1_content2_missing_content4-tracked | |
751 | remote changed content1_content2_missing_content4-untracked which local deleted |
|
751 | remote changed content1_content2_missing_content4-untracked which local deleted | |
752 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
752 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
753 | remote changed content1_content2_missing_missing-tracked which local deleted |
|
753 | remote changed content1_content2_missing_missing-tracked which local deleted | |
754 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
754 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
755 | remote changed content1_content2_missing_missing-untracked which local deleted |
|
755 | remote changed content1_content2_missing_missing-untracked which local deleted | |
756 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
756 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
757 | local changed content1_missing_content1_content4-tracked which remote deleted |
|
757 | local changed content1_missing_content1_content4-tracked which remote deleted | |
758 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
758 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
759 | local changed content1_missing_content3_content3-tracked which remote deleted |
|
759 | local changed content1_missing_content3_content3-tracked which remote deleted | |
760 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
760 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
761 | local changed content1_missing_content3_content4-tracked which remote deleted |
|
761 | local changed content1_missing_content3_content4-tracked which remote deleted | |
762 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
762 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
763 | local changed content1_missing_missing_content4-tracked which remote deleted |
|
763 | local changed content1_missing_missing_content4-tracked which remote deleted | |
764 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
764 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
765 | merging missing_content2_content2_content4-tracked |
|
765 | merging missing_content2_content2_content4-tracked | |
766 | merging missing_content2_content3_content3-tracked |
|
766 | merging missing_content2_content3_content3-tracked | |
767 | merging missing_content2_content3_content4-tracked |
|
767 | merging missing_content2_content3_content4-tracked |
@@ -103,10 +103,11 b' Those who use force will lose' | |||||
103 |
|
103 | |||
104 | $ hg merge -f |
|
104 | $ hg merge -f | |
105 | remote changed bar which local deleted |
|
105 | remote changed bar which local deleted | |
106 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
106 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
107 | merging foo1 and foo to foo1 |
|
107 | merging foo1 and foo to foo1 | |
108 |
0 files updated, |
|
108 | 0 files updated, 1 files merged, 0 files removed, 1 files unresolved | |
109 | (branch merge, don't forget to commit) |
|
109 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
|
110 | [1] | |||
110 | $ cat bar |
|
111 | $ cat bar | |
111 | bleh |
|
112 | bleh | |
112 | $ hg st |
|
113 | $ hg st |
@@ -684,7 +684,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
684 | a: prompt deleted/changed -> m (premerge) |
|
684 | a: prompt deleted/changed -> m (premerge) | |
685 | picked tool ':prompt' for a (binary False symlink False changedelete True) |
|
685 | picked tool ':prompt' for a (binary False symlink False changedelete True) | |
686 | remote changed a which local deleted |
|
686 | remote changed a which local deleted | |
687 |
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
687 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
688 | b: both created -> m (premerge) |
|
688 | b: both created -> m (premerge) | |
689 | picked tool 'python ../merge' for b (binary False symlink False changedelete False) |
|
689 | picked tool 'python ../merge' for b (binary False symlink False changedelete False) | |
690 | merging b |
|
690 | merging b | |
@@ -703,11 +703,12 b' m "um a c" "um x c" " " "10 do merg' | |||||
703 | my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
703 | my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 | |
704 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
|
704 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
705 | merge tool returned: 0 |
|
705 | merge tool returned: 0 | |
706 |
0 files updated, |
|
706 | 0 files updated, 2 files merged, 0 files removed, 1 files unresolved | |
707 | (branch merge, don't forget to commit) |
|
707 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
708 | -------------- |
|
708 | -------------- | |
709 | M a |
|
709 | M a | |
710 | M b |
|
710 | M b | |
|
711 | abort: unresolved merge conflicts (see "hg help resolve") | |||
711 | -------------- |
|
712 | -------------- | |
712 |
|
713 | |||
713 | $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" |
|
714 | $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" | |
@@ -727,7 +728,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
727 | a: prompt changed/deleted -> m (premerge) |
|
728 | a: prompt changed/deleted -> m (premerge) | |
728 | picked tool ':prompt' for a (binary False symlink False changedelete True) |
|
729 | picked tool ':prompt' for a (binary False symlink False changedelete True) | |
729 | local changed a which remote deleted |
|
730 | local changed a which remote deleted | |
730 |
use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
731 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
731 | b: both created -> m (premerge) |
|
732 | b: both created -> m (premerge) | |
732 |
picked tool 'python |
|
733 | picked tool 'python ../merge' for b (binary False symlink False changedelete False) | |
733 | merging b |
|
734 | merging b | |
@@ -746,11 +747,12 b' m "um a c" "um x c" " " "10 do merg' | |||||
746 | my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
747 | my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 | |
747 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
|
748 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) | |
748 | merge tool returned: 0 |
|
749 | merge tool returned: 0 | |
749 |
0 files updated, |
|
750 | 0 files updated, 2 files merged, 0 files removed, 1 files unresolved | |
750 | (branch merge, don't forget to commit) |
|
751 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
751 | -------------- |
|
752 | -------------- | |
752 | M b |
|
753 | M b | |
753 | C a |
|
754 | C a | |
|
755 | abort: unresolved merge conflicts (see "hg help resolve") | |||
754 | -------------- |
|
756 | -------------- | |
755 |
|
757 | |||
756 | $ tm "up a " "um a b" " " "20 merge a and b to b, remove a" |
|
758 | $ tm "up a " "um a b" " " "20 merge a and b to b, remove a" |
General Comments 0
You need to be logged in to leave comments.
Login now