Show More
@@ -253,7 +253,7 b' def _iprompt(repo, mynode, orig, fcd, fc' | |||||
253 | index = ui.promptchoice( |
|
253 | index = ui.promptchoice( | |
254 | _("no tool found to merge %s\n" |
|
254 | _("no tool found to merge %s\n" | |
255 | "keep (l)ocal, take (o)ther, or leave (u)nresolved?" |
|
255 | "keep (l)ocal, take (o)ther, or leave (u)nresolved?" | |
256 |
"$$ &Local $$ &Other $$ &Unresolved") % fd, |
|
256 | "$$ &Local $$ &Other $$ &Unresolved") % fd, 2) | |
257 | choice = ['local', 'other', 'unresolved'][index] |
|
257 | choice = ['local', 'other', 'unresolved'][index] | |
258 |
|
258 | |||
259 | if choice == 'other': |
|
259 | if choice == 'other': |
@@ -474,9 +474,10 b' Force prompts' | |||||
474 | remote changed file2 which local deleted |
|
474 | remote changed file2 which local deleted | |
475 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
|
475 | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c | |
476 | no tool found to merge file3 |
|
476 | no tool found to merge file3 | |
477 |
keep (l)ocal, take (o)ther, or leave (u)nresolved? |
|
477 | keep (l)ocal, take (o)ther, or leave (u)nresolved? u | |
478 |
0 files updated, |
|
478 | 0 files updated, 2 files merged, 0 files removed, 1 files unresolved | |
479 | (branch merge, don't forget to commit) |
|
479 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
|
480 | [1] | |||
480 | $ status |
|
481 | $ status | |
481 | --- status --- |
|
482 | --- status --- | |
482 | M file2 |
|
483 | M file2 | |
@@ -485,7 +486,7 b' Force prompts' | |||||
485 | --- resolve --list --- |
|
486 | --- resolve --list --- | |
486 | R file1 |
|
487 | R file1 | |
487 | R file2 |
|
488 | R file2 | |
488 |
|
|
489 | U file3 | |
489 | --- debugmergestate --- |
|
490 | --- debugmergestate --- | |
490 | * version 2 records |
|
491 | * version 2 records | |
491 | local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 |
|
492 | local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 | |
@@ -498,7 +499,7 b' Force prompts' | |||||
498 | local path: file2 (flags "") |
|
499 | local path: file2 (flags "") | |
499 | ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
|
500 | ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | |
500 | other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
|
501 | other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | |
501 |
file: file3 (record type "F", state " |
|
502 | file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) | |
502 | local path: file3 (flags "") |
|
503 | local path: file3 (flags "") | |
503 | ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
|
504 | ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) | |
504 | other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
|
505 | other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
@@ -532,9 +532,10 b' ui.merge specifies internal:prompt:' | |||||
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 | no tool found to merge f | |
535 |
keep (l)ocal, take (o)ther, or leave (u)nresolved? |
|
535 | keep (l)ocal, take (o)ther, or leave (u)nresolved? u | |
536 |
0 files updated, |
|
536 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
537 | (branch merge, don't forget to commit) |
|
537 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
|
538 | [1] | |||
538 | $ aftermerge |
|
539 | $ aftermerge | |
539 | # cat f |
|
540 | # cat f | |
540 | revision 1 |
|
541 | revision 1 | |
@@ -542,7 +543,7 b' ui.merge specifies internal:prompt:' | |||||
542 | # hg stat |
|
543 | # hg stat | |
543 | M f |
|
544 | M f | |
544 | # hg resolve --list |
|
545 | # hg resolve --list | |
545 |
|
|
546 | U f | |
546 |
|
547 | |||
547 |
ui.merge specifies :prompt, with 'leave |
|
548 | ui.merge specifies :prompt, with 'leave unresolved' chosen | |
548 |
|
549 | |||
@@ -619,8 +620,8 b' prompt with EOF' | |||||
619 |
|
|
620 | U f | |
620 |
$ |
|
621 | $ hg resolve --all --config ui.merge=internal:prompt | |
621 |
|
|
622 | no tool found to merge f | |
622 |
|
|
623 | keep (l)ocal, take (o)ther, or leave (u)nresolved? u | |
623 | (no more unresolved files) |
|
624 | [1] | |
624 |
|
|
625 | $ aftermerge | |
625 | # cat f |
|
626 | # cat f | |
626 |
|
|
627 | revision 1 | |
@@ -629,7 +630,7 b' prompt with EOF' | |||||
629 |
|
|
630 | M f | |
630 | ? f.orig |
|
631 | ? f.orig | |
631 | # hg resolve --list |
|
632 | # hg resolve --list | |
632 |
|
|
633 | U f | |
633 |
|
634 | |||
634 |
|
|
635 | ui.merge specifies internal:dump: | |
635 |
|
636 |
@@ -172,8 +172,10 b' Update to link with local change should ' | |||||
172 | (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) |
|
172 | (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) | |
173 | picked tool ':prompt' for a (binary False symlink True changedelete False) |
|
173 | picked tool ':prompt' for a (binary False symlink True changedelete False) | |
174 | no tool found to merge a |
|
174 | no tool found to merge a | |
175 |
keep (l)ocal, take (o)ther, or leave (u)nresolved? |
|
175 | keep (l)ocal, take (o)ther, or leave (u)nresolved? u | |
176 |
0 files updated, |
|
176 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
177 | use 'hg resolve' to retry unresolved file merges | |||
|
178 | [1] | |||
177 | $ hg diff --git |
|
179 | $ hg diff --git | |
178 | diff --git a/a b/a |
|
180 | diff --git a/a b/a | |
179 | old mode 120000 |
|
181 | old mode 120000 |
General Comments 0
You need to be logged in to leave comments.
Login now