Patchwork [STABLE] help: describe about choice of :prompt as a fallback merge tool explicitly

login
register
mail settings
Submitter Katsunori FUJIWARA
Date May 5, 2017, 5:36 p.m.
Message ID <35b4871944b3162c82c9.1494005781@speaknoevil>
Download mbox | patch
Permalink /patch/20461/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - May 5, 2017, 5:36 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1494005580 -32400
#      Sat May 06 02:33:00 2017 +0900
# Branch stable
# Node ID 35b4871944b3162c82c90444822fdd60b6619a05
# Parent  40785ccab41006f61039714d0d9b2ed09e401b2a
help: describe about choice of :prompt as a fallback merge tool explicitly

"merge-tools" help topic has described that the merge of the file
fails if no tool is found to merge binary or symlink, since
c77f6276c9e7 (or Mercurial 1.7), which based on (already removed)
MergeProgram wiki page.

But even at that revision, and of course now, merge of the file
doesn't fail automatically for binary/symlink. ":prompt" (or
equivalent logic) is used, if there is no appropriate tool
configuration for binary/symlink.
Augie Fackler - May 6, 2017, 4:52 p.m.
On Sat, May 06, 2017 at 02:36:21AM +0900, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
> # Date 1494005580 -32400
> #      Sat May 06 02:33:00 2017 +0900
> # Branch stable
> # Node ID 35b4871944b3162c82c90444822fdd60b6619a05
> # Parent  40785ccab41006f61039714d0d9b2ed09e401b2a
> help: describe about choice of :prompt as a fallback merge tool explicitly

queued, thanks

Patch

diff --git a/mercurial/help/merge-tools.txt b/mercurial/help/merge-tools.txt
--- a/mercurial/help/merge-tools.txt
+++ b/mercurial/help/merge-tools.txt
@@ -70,7 +70,7 @@  6. If a program named ``hgmerge`` can be
 7. If the file to be merged is not binary and is not a symlink, then
    internal ``:merge`` is used.
 
-8. The merge of the file fails and must be resolved before commit.
+8. Otherwise, ``:prompt`` is used.
 
 .. note::
 
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -1831,7 +1831,7 @@  Test dynamic list of merge tools only sh
          but it will by default not be used for symlinks and binary files.
       7. If the file to be merged is not binary and is not a symlink, then
          internal ":merge" is used.
-      8. The merge of the file fails and must be resolved before commit.
+      8. Otherwise, ":prompt" is used.
   
       Note:
          After selecting a merge program, Mercurial will by default attempt to