Show More
@@ -209,6 +209,9 b' def _picktool(repo, ui, path, binary, sy' | |||||
209 |
|
209 | |||
210 | # internal merge or prompt as last resort |
|
210 | # internal merge or prompt as last resort | |
211 | if symlink or binary or changedelete: |
|
211 | if symlink or binary or changedelete: | |
|
212 | if not changedelete and len(tools): | |||
|
213 | # any tool is rejected by capability for symlink or binary | |||
|
214 | ui.warn(_("no tool found to merge %s\n") % path) | |||
212 | return ":prompt", None |
|
215 | return ":prompt", None | |
213 | return ":merge", None |
|
216 | return ":merge", None | |
214 |
|
217 | |||
@@ -260,8 +263,8 b' def _iprompt(repo, mynode, orig, fcd, fc' | |||||
260 | choice = ['other', 'local', 'unresolved'][index] |
|
263 | choice = ['other', 'local', 'unresolved'][index] | |
261 | else: |
|
264 | else: | |
262 | index = ui.promptchoice( |
|
265 | index = ui.promptchoice( | |
263 | _("no tool found to merge %(fd)s\n" |
|
266 | _("keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved" | |
264 | "keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved?" |
|
267 | " for %(fd)s?" | |
265 | "$$ &Local $$ &Other $$ &Unresolved") % prompts, 2) |
|
268 | "$$ &Local $$ &Other $$ &Unresolved") % prompts, 2) | |
266 | choice = ['local', 'other', 'unresolved'][index] |
|
269 | choice = ['local', 'other', 'unresolved'][index] | |
267 |
|
270 |
@@ -470,8 +470,7 b' Force prompts with no input (should be s' | |||||
470 | use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
470 | use (c)hanged version, (d)elete, or leave (u)nresolved? | |
471 | other [merge rev] changed file2 which local [working copy] deleted |
|
471 | other [merge rev] changed file2 which local [working copy] deleted | |
472 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
472 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? | |
473 | no tool found to merge file3 |
|
473 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? | |
474 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? |
|
|||
475 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
|
474 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved | |
476 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
475 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
477 | [1] |
|
476 | [1] | |
@@ -529,8 +528,7 b' Force prompts' | |||||
529 | use (c)hanged version, (d)elete, or leave (u)nresolved? u |
|
528 | use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
530 | other [merge rev] changed file2 which local [working copy] deleted |
|
529 | other [merge rev] changed file2 which local [working copy] deleted | |
531 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
|
530 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | |
532 | no tool found to merge file3 |
|
531 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? u | |
533 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? u |
|
|||
534 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved |
|
532 | 0 files updated, 0 files merged, 0 files removed, 3 files unresolved | |
535 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
533 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
536 | [1] |
|
534 | [1] | |
@@ -676,8 +674,7 b' invocations.)' | |||||
676 | use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
674 | use (c)hanged version, (d)elete, or leave (u)nresolved? | |
677 | other [merge rev] changed file2 which local [working copy] deleted |
|
675 | other [merge rev] changed file2 which local [working copy] deleted | |
678 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
676 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? | |
679 | no tool found to merge file3 |
|
677 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? | |
680 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? |
|
|||
681 | --- diff of status --- |
|
678 | --- diff of status --- | |
682 | (status identical) |
|
679 | (status identical) | |
683 |
|
680 | |||
@@ -705,8 +702,7 b' invocations.)' | |||||
705 | use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
702 | use (c)hanged version, (d)elete, or leave (u)nresolved? | |
706 | other [merge rev] changed file2 which local [working copy] deleted |
|
703 | other [merge rev] changed file2 which local [working copy] deleted | |
707 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
704 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? | |
708 | no tool found to merge file3 |
|
705 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? | |
709 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? |
|
|||
710 | --- diff of status --- |
|
706 | --- diff of status --- | |
711 | (status identical) |
|
707 | (status identical) | |
712 |
|
708 | |||
@@ -724,8 +720,7 b' invocations.)' | |||||
724 | use (c)hanged version, (d)elete, or leave (u)nresolved? |
|
720 | use (c)hanged version, (d)elete, or leave (u)nresolved? | |
725 | other [merge rev] changed file2 which local [working copy] deleted |
|
721 | other [merge rev] changed file2 which local [working copy] deleted | |
726 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? |
|
722 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? | |
727 | no tool found to merge file3 |
|
723 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? | |
728 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? |
|
|||
729 | --- diff of status --- |
|
724 | --- diff of status --- | |
730 | (status identical) |
|
725 | (status identical) | |
731 |
|
726 |
@@ -531,8 +531,7 b' ui.merge specifies internal:prompt:' | |||||
531 | true.executable=cat |
|
531 | true.executable=cat | |
532 | # hg update -C 1 |
|
532 | # hg update -C 1 | |
533 | $ hg merge -r 2 --config ui.merge=internal:prompt |
|
533 | $ hg merge -r 2 --config ui.merge=internal:prompt | |
534 | no tool found to merge f |
|
534 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u | |
535 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? u |
|
|||
536 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
535 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
537 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
536 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
538 | [1] |
|
537 | [1] | |
@@ -556,8 +555,7 b" ui.merge specifies :prompt, with 'leave " | |||||
556 | $ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF |
|
555 | $ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF | |
557 | > u |
|
556 | > u | |
558 | > EOF |
|
557 | > EOF | |
559 | no tool found to merge f |
|
558 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u | |
560 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? u |
|
|||
561 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
559 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
562 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
560 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
563 | [1] |
|
561 | [1] | |
@@ -579,8 +577,7 b' prompt with EOF' | |||||
579 | true.executable=cat |
|
577 | true.executable=cat | |
580 | # hg update -C 1 |
|
578 | # hg update -C 1 | |
581 | $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true |
|
579 | $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true | |
582 | no tool found to merge f |
|
580 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? | |
583 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? |
|
|||
584 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
581 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
585 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
582 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
586 | [1] |
|
583 | [1] | |
@@ -593,8 +590,7 b' prompt with EOF' | |||||
593 | # hg resolve --list |
|
590 | # hg resolve --list | |
594 | U f |
|
591 | U f | |
595 | $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true |
|
592 | $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true | |
596 | no tool found to merge f |
|
593 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? | |
597 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? |
|
|||
598 | [1] |
|
594 | [1] | |
599 | $ aftermerge |
|
595 | $ aftermerge | |
600 | # cat f |
|
596 | # cat f | |
@@ -607,8 +603,7 b' prompt with EOF' | |||||
607 | U f |
|
603 | U f | |
608 | $ rm f |
|
604 | $ rm f | |
609 | $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true |
|
605 | $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true | |
610 | no tool found to merge f |
|
606 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? | |
611 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? |
|
|||
612 | [1] |
|
607 | [1] | |
613 | $ aftermerge |
|
608 | $ aftermerge | |
614 | # cat f |
|
609 | # cat f | |
@@ -619,8 +614,7 b' prompt with EOF' | |||||
619 | # hg resolve --list |
|
614 | # hg resolve --list | |
620 | U f |
|
615 | U f | |
621 | $ hg resolve --all --config ui.merge=internal:prompt |
|
616 | $ hg resolve --all --config ui.merge=internal:prompt | |
622 | no tool found to merge f |
|
617 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u | |
623 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved? u |
|
|||
624 | [1] |
|
618 | [1] | |
625 | $ aftermerge |
|
619 | $ aftermerge | |
626 | # cat f |
|
620 | # cat f |
@@ -171,9 +171,9 b' Update to link with local change should ' | |||||
171 | preserving a for resolve of a |
|
171 | preserving a for resolve of a | |
172 | a: versions differ -> m (premerge) |
|
172 | a: versions differ -> m (premerge) | |
173 | (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) |
|
173 | (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) | |
|
174 | no tool found to merge a | |||
174 | picked tool ':prompt' for a (binary False symlink True changedelete False) |
|
175 | picked tool ':prompt' for a (binary False symlink True changedelete False) | |
175 | no tool found to merge a |
|
176 | keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved for a? u | |
176 | keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved? u |
|
|||
177 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
177 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
178 | use 'hg resolve' to retry unresolved file merges |
|
178 | use 'hg resolve' to retry unresolved file merges | |
179 | 1 other heads for branch "default" |
|
179 | 1 other heads for branch "default" |
General Comments 0
You need to be logged in to leave comments.
Login now