Mercurial > hg
comparison tests/test-merge-tools.t @ 32253:7d4ce4b567c5
filemerge: show warning about choice of :prompt only at an actual fallback
Before this patch, internal merge tool :prompt shows "no tool found to
merge FILE" line, even if :prompt is explicitly specified as a tool to
be used.
This patch shows warning message about choice of :prompt only at an
actual fallback, in which case any tool is rejected by capability for
binary or symlink.
It is for backward compatibility to omit warning message in
"changedelete" case.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sat, 13 May 2017 03:28:36 +0900 |
| parents | c2154979409d |
| children | 177742666abd |
comparison
equal
deleted
inserted
replaced
| 32252:d67991c4fefe | 32253:7d4ce4b567c5 |
|---|---|
| 529 false.whatever= | 529 false.whatever= |
| 530 true.priority=1 | 530 true.priority=1 |
| 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] |
| 539 $ aftermerge | 538 $ aftermerge |
| 540 # cat f | 539 # cat f |
| 554 true.executable=cat | 553 true.executable=cat |
| 555 # hg update -C 1 | 554 # hg update -C 1 |
| 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] |
| 564 $ aftermerge | 562 $ aftermerge |
| 565 # cat f | 563 # cat f |
| 577 false.whatever= | 575 false.whatever= |
| 578 true.priority=1 | 576 true.priority=1 |
| 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] |
| 587 $ aftermerge | 584 $ aftermerge |
| 588 # cat f | 585 # cat f |
| 591 # hg stat | 588 # hg stat |
| 592 M f | 589 M f |
| 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 |
| 601 revision 1 | 597 revision 1 |
| 602 space | 598 space |
| 605 ? f.orig | 601 ? f.orig |
| 606 # hg resolve --list | 602 # hg resolve --list |
| 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 |
| 615 revision 1 | 610 revision 1 |
| 616 space | 611 space |
| 617 # hg stat | 612 # hg stat |
| 618 M f | 613 M f |
| 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 |
| 627 revision 1 | 621 revision 1 |
| 628 space | 622 space |