Show More
@@ -60,17 +60,20 b' nomerge = internaltool.nomerge' | |||||
60 | mergeonly = internaltool.mergeonly # just the full merge, no premerge |
|
60 | mergeonly = internaltool.mergeonly # just the full merge, no premerge | |
61 | fullmerge = internaltool.fullmerge # both premerge and merge |
|
61 | fullmerge = internaltool.fullmerge # both premerge and merge | |
62 |
|
62 | |||
|
63 | # IMPORTANT: keep the last line of this prompt very short ("What do you want to | |||
|
64 | # do?") because of issue6158, ideally to <40 English characters (to allow other | |||
|
65 | # languages that may take more columns to still have a chance to fit in an | |||
|
66 | # 80-column screen). | |||
63 | _localchangedotherdeletedmsg = _( |
|
67 | _localchangedotherdeletedmsg = _( | |
64 | "file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n" |
|
68 | "file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n" | |
65 | "What do you want to do?\n" |
|
69 | "You can use (c)hanged version, (d)elete, or leave (u)nresolved.\n" | |
66 | "use (c)hanged version, (d)elete, or leave (u)nresolved?" |
|
70 | "What do you want to do?" | |
67 | "$$ &Changed $$ &Delete $$ &Unresolved") |
|
71 | "$$ &Changed $$ &Delete $$ &Unresolved") | |
68 |
|
72 | |||
69 | _otherchangedlocaldeletedmsg = _( |
|
73 | _otherchangedlocaldeletedmsg = _( | |
70 | "file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n" |
|
74 | "file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n" | |
71 | "What do you want to do?\n" |
|
75 | "You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.\n" | |
72 | "use (c)hanged version, leave (d)eleted, or " |
|
76 | "What do you want to do?" | |
73 | "leave (u)nresolved?" |
|
|||
74 | "$$ &Changed $$ &Deleted $$ &Unresolved") |
|
77 | "$$ &Changed $$ &Deleted $$ &Unresolved") | |
75 |
|
78 | |||
76 | class absentfilectx(object): |
|
79 | class absentfilectx(object): | |
@@ -299,9 +302,14 b' def _iprompt(repo, mynode, orig, fcd, fc' | |||||
299 | _otherchangedlocaldeletedmsg % prompts, 2) |
|
302 | _otherchangedlocaldeletedmsg % prompts, 2) | |
300 | choice = ['other', 'local', 'unresolved'][index] |
|
303 | choice = ['other', 'local', 'unresolved'][index] | |
301 | else: |
|
304 | else: | |
|
305 | # IMPORTANT: keep the last line of this prompt ("What do you want to | |||
|
306 | # do?") very short, see comment next to _localchangedotherdeletedmsg | |||
|
307 | # at the top of the file for details. | |||
302 | index = ui.promptchoice( |
|
308 | index = ui.promptchoice( | |
303 | _("keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved" |
|
309 | _("file '%(fd)s' needs to be resolved.\n" | |
304 | " for %(fd)s?" |
|
310 | "You can keep (l)ocal%(l)s, take (o)ther%(o)s, or leave " | |
|
311 | "(u)nresolved.\n" | |||
|
312 | "What do you want to do?" | |||
305 | "$$ &Local $$ &Other $$ &Unresolved") % prompts, 2) |
|
313 | "$$ &Local $$ &Other $$ &Unresolved") % prompts, 2) | |
306 | choice = ['local', 'other', 'unresolved'][index] |
|
314 | choice = ['local', 'other', 'unresolved'][index] | |
307 |
|
315 |
@@ -789,8 +789,8 b' in p1 too, but it was recorded as copied' | |||||
789 | $ echo modified >> aaa |
|
789 | $ echo modified >> aaa | |
790 | $ hg co -m '.^' -t :merge3 |
|
790 | $ hg co -m '.^' -t :merge3 | |
791 | file 'aaa' was deleted in other [destination] but was modified in local [working copy]. |
|
791 | file 'aaa' was deleted in other [destination] but was modified in local [working copy]. | |
792 | What do you want to do? |
|
792 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
793 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
793 | What do you want to do? u | |
794 | 1 files updated, 0 files merged, 1 files removed, 1 files unresolved |
|
794 | 1 files updated, 0 files merged, 1 files removed, 1 files unresolved | |
795 | use 'hg resolve' to retry unresolved file merges |
|
795 | use 'hg resolve' to retry unresolved file merges | |
796 | [1] |
|
796 | [1] | |
@@ -839,8 +839,8 b' Amend a merge changeset (with manifest-l' | |||||
839 | > c |
|
839 | > c | |
840 | > EOF |
|
840 | > EOF | |
841 | file 'aa' was deleted in other [merge rev] but was modified in local [working copy]. |
|
841 | file 'aa' was deleted in other [merge rev] but was modified in local [working copy]. | |
842 | What do you want to do? |
|
842 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
843 | use (c)hanged version, (d)elete, or leave (u)nresolved? c |
|
843 | What do you want to do? c | |
844 | $ hg ci -m 'merge bar (with conflicts)' |
|
844 | $ hg ci -m 'merge bar (with conflicts)' | |
845 | $ hg log --config diff.git=1 -pr . |
|
845 | $ hg log --config diff.git=1 -pr . | |
846 | changeset: 28:b4c3035e2544 |
|
846 | changeset: 28:b4c3035e2544 |
@@ -88,8 +88,8 b' Test disabling copy tracing' | |||||
88 | > EOF |
|
88 | > EOF | |
89 | rebasing 2:add3f11052fa "other" (tip) |
|
89 | rebasing 2:add3f11052fa "other" (tip) | |
90 | file 'a' was deleted in local [dest] but was modified in other [source]. |
|
90 | file 'a' was deleted in local [dest] but was modified in other [source]. | |
91 | What do you want to do? |
|
91 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
92 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
|
92 | What do you want to do? c | |
93 |
|
93 | |||
94 | $ cat b |
|
94 | $ cat b | |
95 | 1 |
|
95 | 1 |
@@ -89,8 +89,8 b' Make sure filename heuristics do not whe' | |||||
89 | $ hg rebase -s . -d 1 |
|
89 | $ hg rebase -s . -d 1 | |
90 | rebasing 2:d526312210b9 "mode a" (tip) |
|
90 | rebasing 2:d526312210b9 "mode a" (tip) | |
91 | file 'a' was deleted in local [dest] but was modified in other [source]. |
|
91 | file 'a' was deleted in local [dest] but was modified in other [source]. | |
92 | What do you want to do? |
|
92 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
93 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
93 | What do you want to do? u | |
94 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
94 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
95 | [1] |
|
95 | [1] | |
96 |
|
96 | |||
@@ -246,8 +246,8 b' With small limit' | |||||
246 | rebasing 2:ef716627c70b "mod a" (tip) |
|
246 | rebasing 2:ef716627c70b "mod a" (tip) | |
247 | skipping copytracing for 'a', more candidates than the limit: 7 |
|
247 | skipping copytracing for 'a', more candidates than the limit: 7 | |
248 | file 'a' was deleted in local [dest] but was modified in other [source]. |
|
248 | file 'a' was deleted in local [dest] but was modified in other [source]. | |
249 | What do you want to do? |
|
249 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
250 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
250 | What do you want to do? u | |
251 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
251 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
252 | [1] |
|
252 | [1] | |
253 |
|
253 | |||
@@ -702,8 +702,8 b' When the sourcecommitlimit is small and ' | |||||
702 | $ hg rebase -s 1 -d . |
|
702 | $ hg rebase -s 1 -d . | |
703 | rebasing 1:8b6e13696c38 "added more things to a" |
|
703 | rebasing 1:8b6e13696c38 "added more things to a" | |
704 | file 'a' was deleted in local [dest] but was modified in other [source]. |
|
704 | file 'a' was deleted in local [dest] but was modified in other [source]. | |
705 | What do you want to do? |
|
705 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
706 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
706 | What do you want to do? u | |
707 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
707 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
708 | [1] |
|
708 | [1] | |
709 |
|
709 |
@@ -612,8 +612,8 b' the 1st commit of resuming.' | |||||
612 | rebasing 1:72518492caa6 "#1" |
|
612 | rebasing 1:72518492caa6 "#1" | |
613 | rebasing 4:07d6153b5c04 "#4" |
|
613 | rebasing 4:07d6153b5c04 "#4" | |
614 | file '.hglf/large1' was deleted in other [source] but was modified in local [dest]. |
|
614 | file '.hglf/large1' was deleted in other [source] but was modified in local [dest]. | |
615 | What do you want to do? |
|
615 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
616 | use (c)hanged version, (d)elete, or leave (u)nresolved? c |
|
616 | What do you want to do? c | |
617 |
|
617 | |||
618 | $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' |
|
618 | $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' | |
619 | -e5bb990443d6a92aaf7223813720f7566c9dd05b |
|
619 | -e5bb990443d6a92aaf7223813720f7566c9dd05b |
@@ -128,7 +128,9 b' add some changesets to rename/remove/mer' | |||||
128 | $ hg merge |
|
128 | $ hg merge | |
129 | tool internal:merge (for pattern stuff/maybelarge.dat) can't handle binary |
|
129 | tool internal:merge (for pattern stuff/maybelarge.dat) can't handle binary | |
130 | no tool found to merge stuff/maybelarge.dat |
|
130 | no tool found to merge stuff/maybelarge.dat | |
131 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for stuff/maybelarge.dat? u |
|
131 | file 'stuff/maybelarge.dat' needs to be resolved. | |
|
132 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
133 | What do you want to do? u | |||
132 | merging sub/normal2 and stuff/normal2 to stuff/normal2 |
|
134 | merging sub/normal2 and stuff/normal2 to stuff/normal2 | |
133 | 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
|
135 | 0 files updated, 1 files merged, 0 files removed, 1 files unresolved | |
134 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
136 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
@@ -55,11 +55,11 b' Non-interactive merge:' | |||||
55 |
|
55 | |||
56 | $ hg merge -y |
|
56 | $ hg merge -y | |
57 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
57 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
58 | What do you want to do? |
|
58 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
59 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
59 | What do you want to do? u | |
60 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
|
60 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. | |
61 | What do you want to do? |
|
61 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
62 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
62 | What do you want to do? u | |
63 | merging file3 |
|
63 | merging file3 | |
64 | warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
|
64 | warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') | |
65 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
|
65 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved | |
@@ -124,11 +124,11 b' Interactive merge:' | |||||
124 | > d |
|
124 | > d | |
125 | > EOF |
|
125 | > EOF | |
126 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
126 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
127 | What do you want to do? |
|
127 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
128 | use (c)hanged version, (d)elete, or leave (u)nresolved? c |
|
128 | What do you want to do? c | |
129 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
|
129 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. | |
130 | What do you want to do? |
|
130 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
131 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d |
|
131 | What do you want to do? d | |
132 | merging file3 |
|
132 | merging file3 | |
133 | warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
|
133 | warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') | |
134 | 0 files updated, 2 files merged, 0 files removed, 1 files unresolved |
|
134 | 0 files updated, 2 files merged, 0 files removed, 1 files unresolved | |
@@ -194,23 +194,23 b' Interactive merge with bad input:' | |||||
194 | > c |
|
194 | > c | |
195 | > EOF |
|
195 | > EOF | |
196 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
196 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
197 | What do you want to do? |
|
197 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
198 | use (c)hanged version, (d)elete, or leave (u)nresolved? foo |
|
198 | What do you want to do? foo | |
199 | unrecognized response |
|
199 | unrecognized response | |
200 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
200 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
201 | What do you want to do? |
|
201 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
202 | use (c)hanged version, (d)elete, or leave (u)nresolved? bar |
|
202 | What do you want to do? bar | |
203 | unrecognized response |
|
203 | unrecognized response | |
204 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
204 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
205 | What do you want to do? |
|
205 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
206 | use (c)hanged version, (d)elete, or leave (u)nresolved? d |
|
206 | What do you want to do? d | |
207 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
|
207 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. | |
208 | What do you want to do? |
|
208 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
209 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz |
|
209 | What do you want to do? baz | |
210 | unrecognized response |
|
210 | unrecognized response | |
211 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
|
211 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. | |
212 | What do you want to do? |
|
212 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
213 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
|
213 | What do you want to do? c | |
214 | merging file3 |
|
214 | merging file3 | |
215 | warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
|
215 | warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') | |
216 | 0 files updated, 1 files merged, 1 files removed, 1 files unresolved |
|
216 | 0 files updated, 1 files merged, 1 files removed, 1 files unresolved | |
@@ -272,11 +272,11 b' Interactive merge with not enough input:' | |||||
272 | > d |
|
272 | > d | |
273 | > EOF |
|
273 | > EOF | |
274 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
274 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
275 | What do you want to do? |
|
275 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
276 | use (c)hanged version, (d)elete, or leave (u)nresolved? d |
|
276 | What do you want to do? d | |
277 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
|
277 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. | |
|
278 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |||
278 | What do you want to do? |
|
279 | What do you want to do? | |
279 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
|||
280 | merging file3 |
|
280 | merging file3 | |
281 | warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
|
281 | warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') | |
282 | 0 files updated, 0 files merged, 1 files removed, 2 files unresolved |
|
282 | 0 files updated, 0 files merged, 1 files removed, 2 files unresolved | |
@@ -485,12 +485,14 b' Force prompts with no input (should be s' | |||||
485 |
|
485 | |||
486 | $ hg merge --config ui.interactive=True --tool :prompt |
|
486 | $ hg merge --config ui.interactive=True --tool :prompt | |
487 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
487 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
|
488 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |||
488 | What do you want to do? |
|
489 | What do you want to do? | |
489 | use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
|||
490 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
|
490 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. | |
|
491 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |||
491 | What do you want to do? |
|
492 | What do you want to do? | |
492 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
493 | file 'file3' needs to be resolved. | |
493 |
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved |
|
494 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |
|
495 | What do you want to do? | |||
494 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
|
496 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved | |
495 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
497 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
496 | [1] |
|
498 | [1] | |
@@ -546,12 +548,14 b' Force prompts' | |||||
546 |
|
548 | |||
547 | $ hg merge --tool :prompt |
|
549 | $ hg merge --tool :prompt | |
548 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
550 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
549 | What do you want to do? |
|
551 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
550 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
552 | What do you want to do? u | |
551 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
|
553 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. | |
552 | What do you want to do? |
|
554 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
553 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
555 | What do you want to do? u | |
554 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? u |
|
556 | file 'file3' needs to be resolved. | |
|
557 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
558 | What do you want to do? u | |||
555 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
|
559 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved | |
556 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
560 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
557 | [1] |
|
561 | [1] | |
@@ -605,11 +609,11 b' Choose to merge all files' | |||||
605 |
|
609 | |||
606 | $ hg merge --tool :merge3 |
|
610 | $ hg merge --tool :merge3 | |
607 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
611 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
608 | What do you want to do? |
|
612 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
609 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
613 | What do you want to do? u | |
610 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
|
614 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. | |
611 | What do you want to do? |
|
615 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
612 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
616 | What do you want to do? u | |
613 | merging file3 |
|
617 | merging file3 | |
614 | warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') |
|
618 | warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') | |
615 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
|
619 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved | |
@@ -697,12 +701,14 b' invocations.)' | |||||
697 |
|
701 | |||
698 | === :other -> :prompt === |
|
702 | === :other -> :prompt === | |
699 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
703 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
|
704 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |||
700 | What do you want to do? |
|
705 | What do you want to do? | |
701 | use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
|||
702 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
|
706 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. | |
|
707 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |||
703 | What do you want to do? |
|
708 | What do you want to do? | |
704 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
709 | file 'file3' needs to be resolved. | |
705 |
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved |
|
710 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |
|
711 | What do you want to do? | |||
706 | --- diff of status --- |
|
712 | --- diff of status --- | |
707 | (status identical) |
|
713 | (status identical) | |
708 |
|
714 | |||
@@ -727,12 +733,14 b' invocations.)' | |||||
727 |
|
733 | |||
728 | === :local -> :prompt === |
|
734 | === :local -> :prompt === | |
729 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
735 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
|
736 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |||
730 | What do you want to do? |
|
737 | What do you want to do? | |
731 | use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
|||
732 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
|
738 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. | |
|
739 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |||
733 | What do you want to do? |
|
740 | What do you want to do? | |
734 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
741 | file 'file3' needs to be resolved. | |
735 |
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved |
|
742 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |
|
743 | What do you want to do? | |||
736 | --- diff of status --- |
|
744 | --- diff of status --- | |
737 | (status identical) |
|
745 | (status identical) | |
738 |
|
746 | |||
@@ -747,12 +755,14 b' invocations.)' | |||||
747 |
|
755 | |||
748 | === :fail -> :prompt === |
|
756 | === :fail -> :prompt === | |
749 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
757 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
|
758 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |||
750 | What do you want to do? |
|
759 | What do you want to do? | |
751 | use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
|||
752 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. |
|
760 | file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. | |
|
761 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |||
753 | What do you want to do? |
|
762 | What do you want to do? | |
754 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
763 | file 'file3' needs to be resolved. | |
755 |
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved |
|
764 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |
|
765 | What do you want to do? | |||
756 | --- diff of status --- |
|
766 | --- diff of status --- | |
757 | (status identical) |
|
767 | (status identical) | |
758 |
|
768 | |||
@@ -775,11 +785,11 b' Non-interactive linear update' | |||||
775 | $ hg rm file2 |
|
785 | $ hg rm file2 | |
776 | $ hg update 1 -y |
|
786 | $ hg update 1 -y | |
777 | file 'file1' was deleted in other [destination] but was modified in local [working copy]. |
|
787 | file 'file1' was deleted in other [destination] but was modified in local [working copy]. | |
778 | What do you want to do? |
|
788 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
779 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
789 | What do you want to do? u | |
780 | file 'file2' was deleted in local [working copy] but was modified in other [destination]. |
|
790 | file 'file2' was deleted in local [working copy] but was modified in other [destination]. | |
781 | What do you want to do? |
|
791 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
782 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
792 | What do you want to do? u | |
783 | 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
|
793 | 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | |
784 | use 'hg resolve' to retry unresolved file merges |
|
794 | use 'hg resolve' to retry unresolved file merges | |
785 | [1] |
|
795 | [1] | |
@@ -953,11 +963,11 b' Force prompts with no input' | |||||
953 | $ hg rm file2 |
|
963 | $ hg rm file2 | |
954 | $ hg update 1 --config ui.interactive=True --tool :prompt |
|
964 | $ hg update 1 --config ui.interactive=True --tool :prompt | |
955 | file 'file1' was deleted in other [destination] but was modified in local [working copy]. |
|
965 | file 'file1' was deleted in other [destination] but was modified in local [working copy]. | |
|
966 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |||
956 | What do you want to do? |
|
967 | What do you want to do? | |
957 | use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
|||
958 | file 'file2' was deleted in local [working copy] but was modified in other [destination]. |
|
968 | file 'file2' was deleted in local [working copy] but was modified in other [destination]. | |
|
969 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |||
959 | What do you want to do? |
|
970 | What do you want to do? | |
960 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
|||
961 | 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
|
971 | 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | |
962 | use 'hg resolve' to retry unresolved file merges |
|
972 | use 'hg resolve' to retry unresolved file merges | |
963 | [1] |
|
973 | [1] | |
@@ -1005,11 +1015,11 b' Choose to merge all files' | |||||
1005 | $ hg rm file2 |
|
1015 | $ hg rm file2 | |
1006 | $ hg update 1 --tool :merge3 |
|
1016 | $ hg update 1 --tool :merge3 | |
1007 | file 'file1' was deleted in other [destination] but was modified in local [working copy]. |
|
1017 | file 'file1' was deleted in other [destination] but was modified in local [working copy]. | |
1008 | What do you want to do? |
|
1018 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
1009 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
1019 | What do you want to do? u | |
1010 | file 'file2' was deleted in local [working copy] but was modified in other [destination]. |
|
1020 | file 'file2' was deleted in local [working copy] but was modified in other [destination]. | |
1011 | What do you want to do? |
|
1021 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
1012 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
1022 | What do you want to do? u | |
1013 | 1 files updated, 0 files merged, 0 files removed, 2 files unresolved |
|
1023 | 1 files updated, 0 files merged, 0 files removed, 2 files unresolved | |
1014 | use 'hg resolve' to retry unresolved file merges |
|
1024 | use 'hg resolve' to retry unresolved file merges | |
1015 | [1] |
|
1025 | [1] | |
@@ -1063,11 +1073,11 b' Test transitions between different merge' | |||||
1063 |
|
1073 | |||
1064 | === :other -> :prompt === |
|
1074 | === :other -> :prompt === | |
1065 | file 'file1' was deleted in other [destination] but was modified in local [working copy]. |
|
1075 | file 'file1' was deleted in other [destination] but was modified in local [working copy]. | |
|
1076 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |||
1066 | What do you want to do? |
|
1077 | What do you want to do? | |
1067 | use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
|||
1068 | file 'file2' was deleted in local [working copy] but was modified in other [destination]. |
|
1078 | file 'file2' was deleted in local [working copy] but was modified in other [destination]. | |
|
1079 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |||
1069 | What do you want to do? |
|
1080 | What do you want to do? | |
1070 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
|||
1071 | --- diff of status --- |
|
1081 | --- diff of status --- | |
1072 | (status identical) |
|
1082 | (status identical) | |
1073 |
|
1083 | |||
@@ -1092,11 +1102,11 b' Test transitions between different merge' | |||||
1092 |
|
1102 | |||
1093 | === :local -> :prompt === |
|
1103 | === :local -> :prompt === | |
1094 | file 'file1' was deleted in other [destination] but was modified in local [working copy]. |
|
1104 | file 'file1' was deleted in other [destination] but was modified in local [working copy]. | |
|
1105 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |||
1095 | What do you want to do? |
|
1106 | What do you want to do? | |
1096 | use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
|||
1097 | file 'file2' was deleted in local [working copy] but was modified in other [destination]. |
|
1107 | file 'file2' was deleted in local [working copy] but was modified in other [destination]. | |
|
1108 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |||
1098 | What do you want to do? |
|
1109 | What do you want to do? | |
1099 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
|||
1100 | --- diff of status --- |
|
1110 | --- diff of status --- | |
1101 | (status identical) |
|
1111 | (status identical) | |
1102 |
|
1112 | |||
@@ -1111,11 +1121,11 b' Test transitions between different merge' | |||||
1111 |
|
1121 | |||
1112 | === :fail -> :prompt === |
|
1122 | === :fail -> :prompt === | |
1113 | file 'file1' was deleted in other [destination] but was modified in local [working copy]. |
|
1123 | file 'file1' was deleted in other [destination] but was modified in local [working copy]. | |
|
1124 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |||
1114 | What do you want to do? |
|
1125 | What do you want to do? | |
1115 | use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
|||
1116 | file 'file2' was deleted in local [working copy] but was modified in other [destination]. |
|
1126 | file 'file2' was deleted in local [working copy] but was modified in other [destination]. | |
|
1127 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |||
1117 | What do you want to do? |
|
1128 | What do you want to do? | |
1118 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
|||
1119 | --- diff of status --- |
|
1129 | --- diff of status --- | |
1120 | (status identical) |
|
1130 | (status identical) | |
1121 |
|
1131 |
@@ -143,80 +143,80 b' Merge with remote' | |||||
143 |
|
143 | |||
144 | $ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1 |
|
144 | $ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1 | |
145 | file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. |
|
145 | file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. | |
146 | What do you want to do? |
|
146 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
147 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
147 | What do you want to do? u | |
148 | file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy]. |
|
148 | file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy]. | |
149 | What do you want to do? |
|
149 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
150 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
150 | What do you want to do? u | |
151 | file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. |
|
151 | file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. | |
152 | What do you want to do? |
|
152 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
153 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
153 | What do you want to do? u | |
154 | file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. |
|
154 | file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. | |
155 | What do you want to do? |
|
155 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
156 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
156 | What do you want to do? u | |
157 | file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
157 | file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
158 | What do you want to do? |
|
158 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
159 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
159 | What do you want to do? u | |
160 | file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
160 | file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
161 | What do you want to do? |
|
161 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
162 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
162 | What do you want to do? u | |
163 | file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
163 | file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
164 | What do you want to do? |
|
164 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
165 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
165 | What do you want to do? u | |
166 | file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
166 | file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
167 | What do you want to do? |
|
167 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
168 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
168 | What do you want to do? u | |
169 | file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
169 | file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
170 | What do you want to do? |
|
170 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
171 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
171 | What do you want to do? u | |
172 | file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
172 | file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
173 | What do you want to do? |
|
173 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
174 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
174 | What do you want to do? u | |
175 | file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
175 | file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
176 | What do you want to do? |
|
176 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
177 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
177 | What do you want to do? u | |
178 | file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
178 | file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
179 | What do you want to do? |
|
179 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
180 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
180 | What do you want to do? u | |
181 | file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
181 | file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
182 | What do you want to do? |
|
182 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
183 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
183 | What do you want to do? u | |
184 | file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
184 | file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
185 | What do you want to do? |
|
185 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
186 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
186 | What do you want to do? u | |
187 | file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
187 | file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
188 | What do you want to do? |
|
188 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
189 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
189 | What do you want to do? u | |
190 | file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
190 | file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
191 | What do you want to do? |
|
191 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
192 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
192 | What do you want to do? u | |
193 | file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
193 | file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
194 | What do you want to do? |
|
194 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
195 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
195 | What do you want to do? u | |
196 | file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
196 | file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
197 | What do you want to do? |
|
197 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
198 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
198 | What do you want to do? u | |
199 | file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
199 | file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
200 | What do you want to do? |
|
200 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
201 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
201 | What do you want to do? u | |
202 | file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
202 | file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
203 | What do you want to do? |
|
203 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
204 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
204 | What do you want to do? u | |
205 | file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
205 | file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
206 | What do you want to do? |
|
206 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
207 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
207 | What do you want to do? u | |
208 | file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
208 | file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
209 | What do you want to do? |
|
209 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
210 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
210 | What do you want to do? u | |
211 | file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
211 | file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
212 | What do you want to do? |
|
212 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
213 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
213 | What do you want to do? u | |
214 | file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
214 | file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
215 | What do you want to do? |
|
215 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
216 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
216 | What do you want to do? u | |
217 | file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
217 | file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
218 | What do you want to do? |
|
218 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
219 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
219 | What do you want to do? u | |
220 | merging content1_content2_content1_content4-tracked |
|
220 | merging content1_content2_content1_content4-tracked | |
221 | merging content1_content2_content2_content1-tracked |
|
221 | merging content1_content2_content2_content1-tracked | |
222 | merging content1_content2_content2_content4-tracked |
|
222 | merging content1_content2_content2_content4-tracked | |
@@ -729,88 +729,88 b' Re-resolve and check status' | |||||
729 | $ hg resolve --unmark --all |
|
729 | $ hg resolve --unmark --all | |
730 | $ hg resolve --all --tool internal:merge3 |
|
730 | $ hg resolve --all --tool internal:merge3 | |
731 | file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
731 | file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
732 | What do you want to do? |
|
732 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
733 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
733 | What do you want to do? u | |
734 | file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
734 | file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
735 | What do you want to do? |
|
735 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
736 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
736 | What do you want to do? u | |
737 | merging content1_content2_content1_content4-tracked |
|
737 | merging content1_content2_content1_content4-tracked | |
738 | file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
738 | file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
739 | What do you want to do? |
|
739 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
740 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
740 | What do you want to do? u | |
741 | file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
741 | file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
742 | What do you want to do? |
|
742 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
743 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
743 | What do you want to do? u | |
744 | file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
744 | file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
745 | What do you want to do? |
|
745 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
746 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
746 | What do you want to do? u | |
747 | merging content1_content2_content2_content1-tracked |
|
747 | merging content1_content2_content2_content1-tracked | |
748 | file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
748 | file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
749 | What do you want to do? |
|
749 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
750 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
750 | What do you want to do? u | |
751 | file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
751 | file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
752 | What do you want to do? |
|
752 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
753 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
753 | What do you want to do? u | |
754 | merging content1_content2_content2_content4-tracked |
|
754 | merging content1_content2_content2_content4-tracked | |
755 | file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
755 | file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
756 | What do you want to do? |
|
756 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
757 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
757 | What do you want to do? u | |
758 | file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
758 | file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
759 | What do you want to do? |
|
759 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
760 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
760 | What do you want to do? u | |
761 | file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
761 | file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
762 | What do you want to do? |
|
762 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
763 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
763 | What do you want to do? u | |
764 | merging content1_content2_content3_content1-tracked |
|
764 | merging content1_content2_content3_content1-tracked | |
765 | file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
765 | file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
766 | What do you want to do? |
|
766 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
767 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
767 | What do you want to do? u | |
768 | file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
768 | file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
769 | What do you want to do? |
|
769 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
770 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
770 | What do you want to do? u | |
771 | merging content1_content2_content3_content3-tracked |
|
771 | merging content1_content2_content3_content3-tracked | |
772 | file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
772 | file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
773 | What do you want to do? |
|
773 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
774 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
774 | What do you want to do? u | |
775 | merging content1_content2_content3_content4-tracked |
|
775 | merging content1_content2_content3_content4-tracked | |
776 | file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
776 | file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
777 | What do you want to do? |
|
777 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
778 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
778 | What do you want to do? u | |
779 | file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
779 | file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
780 | What do you want to do? |
|
780 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
781 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
781 | What do you want to do? u | |
782 | file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
782 | file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
783 | What do you want to do? |
|
783 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
784 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
784 | What do you want to do? u | |
785 | merging content1_content2_missing_content1-tracked |
|
785 | merging content1_content2_missing_content1-tracked | |
786 | file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
786 | file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
787 | What do you want to do? |
|
787 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
788 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
788 | What do you want to do? u | |
789 | file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
789 | file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
790 | What do you want to do? |
|
790 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
791 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
791 | What do you want to do? u | |
792 | merging content1_content2_missing_content4-tracked |
|
792 | merging content1_content2_missing_content4-tracked | |
793 | file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
793 | file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
794 | What do you want to do? |
|
794 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
795 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
795 | What do you want to do? u | |
796 | file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
796 | file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
797 | What do you want to do? |
|
797 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
798 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
798 | What do you want to do? u | |
799 | file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. |
|
799 | file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. | |
800 | What do you want to do? |
|
800 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
801 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
801 | What do you want to do? u | |
802 | file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. |
|
802 | file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. | |
803 | What do you want to do? |
|
803 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
804 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
804 | What do you want to do? u | |
805 | file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy]. |
|
805 | file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy]. | |
806 | What do you want to do? |
|
806 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
807 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
807 | What do you want to do? u | |
808 | file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. |
|
808 | file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. | |
809 | What do you want to do? |
|
809 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
810 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
810 | What do you want to do? u | |
811 | file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. |
|
811 | file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. | |
812 | What do you want to do? |
|
812 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
813 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
813 | What do you want to do? u | |
814 | merging missing_content2_content2_content4-tracked |
|
814 | merging missing_content2_content2_content4-tracked | |
815 | merging missing_content2_content3_content3-tracked |
|
815 | merging missing_content2_content3_content3-tracked | |
816 | merging missing_content2_content3_content4-tracked |
|
816 | merging missing_content2_content3_content4-tracked |
@@ -103,8 +103,8 b' Those who use force will lose' | |||||
103 |
|
103 | |||
104 | $ hg merge -f |
|
104 | $ hg merge -f | |
105 | file 'bar' was deleted in local [working copy] but was modified in other [merge rev]. |
|
105 | file 'bar' was deleted in local [working copy] but was modified in other [merge rev]. | |
106 | What do you want to do? |
|
106 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
107 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
107 | What do you want to do? u | |
108 | merging foo1 and foo to foo1 |
|
108 | merging foo1 and foo to foo1 | |
109 | 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
|
109 | 0 files updated, 1 files merged, 0 files removed, 1 files unresolved | |
110 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
110 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
@@ -112,8 +112,8 b' missing file in the top level repo.' | |||||
112 | > d |
|
112 | > d | |
113 | > EOF |
|
113 | > EOF | |
114 | file 'b' was deleted in local [working copy] but was modified in other [destination]. |
|
114 | file 'b' was deleted in local [working copy] but was modified in other [destination]. | |
115 | What do you want to do? |
|
115 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
116 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d |
|
116 | What do you want to do? d | |
117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
117 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
118 |
|
118 | |||
119 | XXX: There's a difference between wdir() and '.', so there should be a status. |
|
119 | XXX: There's a difference between wdir() and '.', so there should be a status. |
@@ -713,7 +713,9 b' ui.merge specifies internal:prompt:' | |||||
713 | true.executable=cat |
|
713 | true.executable=cat | |
714 | # hg update -C 1 |
|
714 | # hg update -C 1 | |
715 | $ hg merge -r 2 --config ui.merge=internal:prompt |
|
715 | $ hg merge -r 2 --config ui.merge=internal:prompt | |
716 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
716 | file 'f' needs to be resolved. | |
|
717 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
718 | What do you want to do? u | |||
717 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
719 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
718 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
720 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
719 | [1] |
|
721 | [1] | |
@@ -737,7 +739,9 b" ui.merge specifies :prompt, with 'leave " | |||||
737 | $ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF |
|
739 | $ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF | |
738 | > u |
|
740 | > u | |
739 | > EOF |
|
741 | > EOF | |
740 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
742 | file 'f' needs to be resolved. | |
|
743 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
744 | What do you want to do? u | |||
741 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
745 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
742 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
746 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
743 | [1] |
|
747 | [1] | |
@@ -759,7 +763,9 b' prompt with EOF' | |||||
759 | true.executable=cat |
|
763 | true.executable=cat | |
760 | # hg update -C 1 |
|
764 | # hg update -C 1 | |
761 | $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true |
|
765 | $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true | |
762 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? |
|
766 | file 'f' needs to be resolved. | |
|
767 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
768 | What do you want to do? | |||
763 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
769 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
764 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
770 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
765 | [1] |
|
771 | [1] | |
@@ -772,7 +778,9 b' prompt with EOF' | |||||
772 | # hg resolve --list |
|
778 | # hg resolve --list | |
773 | U f |
|
779 | U f | |
774 | $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true |
|
780 | $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true | |
775 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? |
|
781 | file 'f' needs to be resolved. | |
|
782 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
783 | What do you want to do? | |||
776 | [1] |
|
784 | [1] | |
777 | $ aftermerge |
|
785 | $ aftermerge | |
778 | # cat f |
|
786 | # cat f | |
@@ -785,7 +793,9 b' prompt with EOF' | |||||
785 | U f |
|
793 | U f | |
786 | $ rm f |
|
794 | $ rm f | |
787 | $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true |
|
795 | $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true | |
788 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? |
|
796 | file 'f' needs to be resolved. | |
|
797 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
798 | What do you want to do? | |||
789 | [1] |
|
799 | [1] | |
790 | $ aftermerge |
|
800 | $ aftermerge | |
791 | # cat f |
|
801 | # cat f | |
@@ -796,7 +806,9 b' prompt with EOF' | |||||
796 | # hg resolve --list |
|
806 | # hg resolve --list | |
797 | U f |
|
807 | U f | |
798 | $ hg resolve --all --config ui.merge=internal:prompt |
|
808 | $ hg resolve --all --config ui.merge=internal:prompt | |
799 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
809 | file 'f' needs to be resolved. | |
|
810 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
811 | What do you want to do? u | |||
800 | [1] |
|
812 | [1] | |
801 | $ aftermerge |
|
813 | $ aftermerge | |
802 | # cat f |
|
814 | # cat f | |
@@ -1908,7 +1920,9 b' checked strictly.' | |||||
1908 | tool :other can't handle binary |
|
1920 | tool :other can't handle binary | |
1909 | tool false can't handle binary |
|
1921 | tool false can't handle binary | |
1910 | no tool found to merge b |
|
1922 | no tool found to merge b | |
1911 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for b? u |
|
1923 | file 'b' needs to be resolved. | |
|
1924 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
1925 | What do you want to do? u | |||
1912 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
1926 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
1913 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
1927 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
1914 | [1] |
|
1928 | [1] |
@@ -39,7 +39,9 b' Symlink is local parent, executable is o' | |||||
39 | couldn't find merge tool hgmerge |
|
39 | couldn't find merge tool hgmerge | |
40 | no tool found to merge a |
|
40 | no tool found to merge a | |
41 | picked tool ':prompt' for a (binary False symlink True changedelete False) |
|
41 | picked tool ':prompt' for a (binary False symlink True changedelete False) | |
42 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for a? u |
|
42 | file 'a' needs to be resolved. | |
|
43 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
44 | What do you want to do? u | |||
43 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
45 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
44 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
46 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
45 | [1] |
|
47 | [1] | |
@@ -168,7 +170,9 b' Update to link with local change should ' | |||||
168 | (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) |
|
170 | (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) | |
169 | no tool found to merge a |
|
171 | no tool found to merge a | |
170 | picked tool ':prompt' for a (binary False symlink True changedelete False) |
|
172 | picked tool ':prompt' for a (binary False symlink True changedelete False) | |
171 | keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved for a? u |
|
173 | file 'a' needs to be resolved. | |
|
174 | You can keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved. | |||
|
175 | What do you want to do? u | |||
172 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
176 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
173 | use 'hg resolve' to retry unresolved file merges |
|
177 | use 'hg resolve' to retry unresolved file merges | |
174 | updated to "521a1e40188f: symlink" |
|
178 | updated to "521a1e40188f: symlink" | |
@@ -203,7 +207,9 b' where that was what happened.' | |||||
203 | $ hg merge |
|
207 | $ hg merge | |
204 | tool internal:merge (for pattern f) can't handle symlinks |
|
208 | tool internal:merge (for pattern f) can't handle symlinks | |
205 | no tool found to merge f |
|
209 | no tool found to merge f | |
206 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
210 | file 'f' needs to be resolved. | |
|
211 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
212 | What do you want to do? u | |||
207 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
213 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
208 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
214 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
209 | [1] |
|
215 | [1] | |
@@ -215,7 +221,9 b' where that was what happened.' | |||||
215 | $ hg merge |
|
221 | $ hg merge | |
216 | tool internal:merge (for pattern f) can't handle symlinks |
|
222 | tool internal:merge (for pattern f) can't handle symlinks | |
217 | no tool found to merge f |
|
223 | no tool found to merge f | |
218 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
224 | file 'f' needs to be resolved. | |
|
225 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
226 | What do you want to do? u | |||
219 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
227 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
220 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
228 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
221 | [1] |
|
229 | [1] | |
@@ -242,7 +250,9 b" Test removed 'x' flag merged with change" | |||||
242 | $ hg merge |
|
250 | $ hg merge | |
243 | tool internal:merge (for pattern f) can't handle symlinks |
|
251 | tool internal:merge (for pattern f) can't handle symlinks | |
244 | no tool found to merge f |
|
252 | no tool found to merge f | |
245 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
253 | file 'f' needs to be resolved. | |
|
254 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
255 | What do you want to do? u | |||
246 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
256 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
247 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
257 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
248 | [1] |
|
258 | [1] | |
@@ -254,7 +264,9 b" Test removed 'x' flag merged with change" | |||||
254 | $ hg merge |
|
264 | $ hg merge | |
255 | tool internal:merge (for pattern f) can't handle symlinks |
|
265 | tool internal:merge (for pattern f) can't handle symlinks | |
256 | no tool found to merge f |
|
266 | no tool found to merge f | |
257 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
267 | file 'f' needs to be resolved. | |
|
268 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
269 | What do you want to do? u | |||
258 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
270 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
259 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
271 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
260 | [1] |
|
272 | [1] | |
@@ -337,13 +349,19 b' h: l vs l, different' | |||||
337 | warning: cannot merge flags for c without common ancestor - keeping local flags |
|
349 | warning: cannot merge flags for c without common ancestor - keeping local flags | |
338 | tool internal:merge (for pattern d) can't handle symlinks |
|
350 | tool internal:merge (for pattern d) can't handle symlinks | |
339 | no tool found to merge d |
|
351 | no tool found to merge d | |
340 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u |
|
352 | file 'd' needs to be resolved. | |
|
353 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
354 | What do you want to do? u | |||
341 | tool internal:merge (for pattern f) can't handle symlinks |
|
355 | tool internal:merge (for pattern f) can't handle symlinks | |
342 | no tool found to merge f |
|
356 | no tool found to merge f | |
343 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
357 | file 'f' needs to be resolved. | |
|
358 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
359 | What do you want to do? u | |||
344 | tool internal:merge (for pattern h) can't handle symlinks |
|
360 | tool internal:merge (for pattern h) can't handle symlinks | |
345 | no tool found to merge h |
|
361 | no tool found to merge h | |
346 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u |
|
362 | file 'h' needs to be resolved. | |
|
363 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
364 | What do you want to do? u | |||
347 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
365 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
348 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
|
366 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |
349 | warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
|
367 | warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') | |
@@ -399,13 +417,19 b' h: l vs l, different' | |||||
399 | warning: cannot merge flags for c without common ancestor - keeping local flags |
|
417 | warning: cannot merge flags for c without common ancestor - keeping local flags | |
400 | tool internal:merge (for pattern d) can't handle symlinks |
|
418 | tool internal:merge (for pattern d) can't handle symlinks | |
401 | no tool found to merge d |
|
419 | no tool found to merge d | |
402 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u |
|
420 | file 'd' needs to be resolved. | |
|
421 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
422 | What do you want to do? u | |||
403 | tool internal:merge (for pattern f) can't handle symlinks |
|
423 | tool internal:merge (for pattern f) can't handle symlinks | |
404 | no tool found to merge f |
|
424 | no tool found to merge f | |
405 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
425 | file 'f' needs to be resolved. | |
|
426 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
427 | What do you want to do? u | |||
406 | tool internal:merge (for pattern h) can't handle symlinks |
|
428 | tool internal:merge (for pattern h) can't handle symlinks | |
407 | no tool found to merge h |
|
429 | no tool found to merge h | |
408 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u |
|
430 | file 'h' needs to be resolved. | |
|
431 | You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. | |||
|
432 | What do you want to do? u | |||
409 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
433 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
410 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
|
434 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |
411 | warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
|
435 | warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
@@ -134,8 +134,8 b' Full rebase all the way back from branch' | |||||
134 | rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
|
134 | rebasing 2:ec2c14fb2984 "dev: f-dev stuff" | |
135 | rebasing 4:4b019212aaf6 "dev: merge default" |
|
135 | rebasing 4:4b019212aaf6 "dev: merge default" | |
136 | file 'f-default' was deleted in local [dest] but was modified in other [source]. |
|
136 | file 'f-default' was deleted in local [dest] but was modified in other [source]. | |
137 | What do you want to do? |
|
137 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
138 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
|
138 | What do you want to do? c | |
139 | rebasing 6:9455ee510502 "dev: merge default" |
|
139 | rebasing 6:9455ee510502 "dev: merge default" | |
140 | saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg |
|
140 | saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg | |
141 | $ hg tglog |
|
141 | $ hg tglog | |
@@ -164,8 +164,8 b' Grafty cherry picking rebasing:' | |||||
164 | rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
|
164 | rebasing 2:ec2c14fb2984 "dev: f-dev stuff" | |
165 | rebasing 4:4b019212aaf6 "dev: merge default" |
|
165 | rebasing 4:4b019212aaf6 "dev: merge default" | |
166 | file 'f-default' was deleted in local [dest] but was modified in other [source]. |
|
166 | file 'f-default' was deleted in local [dest] but was modified in other [source]. | |
167 | What do you want to do? |
|
167 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
168 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
|
168 | What do you want to do? c | |
169 | rebasing 6:9455ee510502 "dev: merge default" |
|
169 | rebasing 6:9455ee510502 "dev: merge default" | |
170 | saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-rebase.hg |
|
170 | saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-rebase.hg | |
171 | $ hg tglog |
|
171 | $ hg tglog |
@@ -683,8 +683,8 b' m "um a c" "um x c" " " "10 do merg' | |||||
683 | a: prompt deleted/changed -> m (premerge) |
|
683 | a: prompt deleted/changed -> m (premerge) | |
684 | picked tool ':prompt' for a (binary False symlink False changedelete True) |
|
684 | picked tool ':prompt' for a (binary False symlink False changedelete True) | |
685 | file 'a' was deleted in local [working copy] but was modified in other [merge rev]. |
|
685 | file 'a' was deleted in local [working copy] but was modified in other [merge rev]. | |
686 | What do you want to do? |
|
686 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
687 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
687 | What do you want to do? u | |
688 | b: both created -> m (premerge) |
|
688 | b: both created -> m (premerge) | |
689 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
689 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
690 | merging b |
|
690 | merging b | |
@@ -729,8 +729,8 b' m "um a c" "um x c" " " "10 do merg' | |||||
729 | a: prompt changed/deleted -> m (premerge) |
|
729 | a: prompt changed/deleted -> m (premerge) | |
730 | picked tool ':prompt' for a (binary False symlink False changedelete True) |
|
730 | picked tool ':prompt' for a (binary False symlink False changedelete True) | |
731 | file 'a' was deleted in other [merge rev] but was modified in local [working copy]. |
|
731 | file 'a' was deleted in other [merge rev] but was modified in local [working copy]. | |
732 | What do you want to do? |
|
732 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
733 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
733 | What do you want to do? u | |
734 | b: both created -> m (premerge) |
|
734 | b: both created -> m (premerge) | |
735 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) |
|
735 | picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) | |
736 | merging b |
|
736 | merging b |
@@ -649,8 +649,8 b' Test that commands.resolve.mark-check wo' | |||||
649 |
|
649 | |||
650 | $ hg merge -r 1 |
|
650 | $ hg merge -r 1 | |
651 | file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. |
|
651 | file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | |
652 | What do you want to do? |
|
652 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
653 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
653 | What do you want to do? u | |
654 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
654 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
655 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
655 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
656 | [1] |
|
656 | [1] | |
@@ -678,8 +678,8 b" Let's resolve the issue by deleting the " | |||||
678 | $ hg resolve --unmark file1 |
|
678 | $ hg resolve --unmark file1 | |
679 | $ echo 'd' | hg resolve file1 --config ui.interactive=1 |
|
679 | $ echo 'd' | hg resolve file1 --config ui.interactive=1 | |
680 | file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. |
|
680 | file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | |
681 | What do you want to do? |
|
681 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
682 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d |
|
682 | What do you want to do? d | |
683 | (no more unresolved files) |
|
683 | (no more unresolved files) | |
684 | $ hg resolve --list |
|
684 | $ hg resolve --list | |
685 | R file1 |
|
685 | R file1 | |
@@ -694,8 +694,8 b' Resurrect the file, and delete it outsid' | |||||
694 | $ hg resolve --unmark file1 |
|
694 | $ hg resolve --unmark file1 | |
695 | $ hg resolve file1 |
|
695 | $ hg resolve file1 | |
696 | file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. |
|
696 | file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | |
697 | What do you want to do? |
|
697 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
698 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
698 | What do you want to do? u | |
699 | [1] |
|
699 | [1] | |
700 | $ [ -f file1 ] || echo "File does not exist?" |
|
700 | $ [ -f file1 ] || echo "File does not exist?" | |
701 | $ hg resolve --list |
|
701 | $ hg resolve --list | |
@@ -708,8 +708,8 b' Resurrect the file, and delete it outsid' | |||||
708 | $ hg resolve --unmark file1 |
|
708 | $ hg resolve --unmark file1 | |
709 | $ hg resolve file1 |
|
709 | $ hg resolve file1 | |
710 | file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. |
|
710 | file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. | |
711 | What do you want to do? |
|
711 | You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. | |
712 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
712 | What do you want to do? u | |
713 | [1] |
|
713 | [1] | |
714 | $ [ -f file1 ] || echo "File does not exist?" |
|
714 | $ [ -f file1 ] || echo "File does not exist?" | |
715 | $ hg resolve --list |
|
715 | $ hg resolve --list | |
@@ -726,8 +726,8 b' instead of r1 into r2):' | |||||
726 | $ hg update -qCr 1 |
|
726 | $ hg update -qCr 1 | |
727 | $ hg merge -r 2 |
|
727 | $ hg merge -r 2 | |
728 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
728 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
729 | What do you want to do? |
|
729 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
730 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
730 | What do you want to do? u | |
731 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
731 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
732 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
732 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
733 | [1] |
|
733 | [1] | |
@@ -755,8 +755,8 b" Let's resolve the issue by deleting the " | |||||
755 | $ hg resolve --unmark file1 |
|
755 | $ hg resolve --unmark file1 | |
756 | $ echo 'd' | hg resolve file1 --config ui.interactive=1 |
|
756 | $ echo 'd' | hg resolve file1 --config ui.interactive=1 | |
757 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
757 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
758 | What do you want to do? |
|
758 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
759 | use (c)hanged version, (d)elete, or leave (u)nresolved? d |
|
759 | What do you want to do? d | |
760 | (no more unresolved files) |
|
760 | (no more unresolved files) | |
761 | $ hg resolve --list |
|
761 | $ hg resolve --list | |
762 | R file1 |
|
762 | R file1 | |
@@ -771,8 +771,8 b' Resurrect the file, and delete it outsid' | |||||
771 | $ hg resolve --unmark file1 |
|
771 | $ hg resolve --unmark file1 | |
772 | $ hg resolve file1 |
|
772 | $ hg resolve file1 | |
773 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
773 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
774 | What do you want to do? |
|
774 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
775 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
775 | What do you want to do? u | |
776 | [1] |
|
776 | [1] | |
777 | $ [ -f file1 ] || echo "File does not exist?" |
|
777 | $ [ -f file1 ] || echo "File does not exist?" | |
778 | $ hg resolve --list |
|
778 | $ hg resolve --list | |
@@ -785,8 +785,8 b' Resurrect the file, and delete it outsid' | |||||
785 | $ hg resolve --unmark file1 |
|
785 | $ hg resolve --unmark file1 | |
786 | $ hg resolve file1 |
|
786 | $ hg resolve file1 | |
787 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. |
|
787 | file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. | |
788 | What do you want to do? |
|
788 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
789 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
789 | What do you want to do? u | |
790 | [1] |
|
790 | [1] | |
791 | $ [ -f file1 ] || echo "File does not exist?" |
|
791 | $ [ -f file1 ] || echo "File does not exist?" | |
792 | $ hg resolve --list |
|
792 | $ hg resolve --list |
@@ -114,8 +114,8 b' file is excluded from sparse checkout' | |||||
114 | $ hg merge |
|
114 | $ hg merge | |
115 | temporarily included 1 file(s) in the sparse checkout for merging |
|
115 | temporarily included 1 file(s) in the sparse checkout for merging | |
116 | file 'd' was deleted in other [merge rev] but was modified in local [working copy]. |
|
116 | file 'd' was deleted in other [merge rev] but was modified in local [working copy]. | |
117 | What do you want to do? |
|
117 | You can use (c)hanged version, (d)elete, or leave (u)nresolved. | |
118 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
118 | What do you want to do? u | |
119 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
119 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
120 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
120 | use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | |
121 | [1] |
|
121 | [1] |
General Comments 0
You need to be logged in to leave comments.
Login now