[PATCH 3 of 4] remove: quote --force in never deletes note

timeless timeless at mozdev.org
Tue Dec 22 00:15:54 CST 2015


# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1450764121 0
#      Tue Dec 22 06:02:01 2015 +0000
# Node ID f825d568b2a3d23af05ea8745ae75548710f613d
# Parent  2f3879cfb2e943c3ca72566602c5ded9925ccbde
remove: quote --force in never deletes note

Split Note into a note container

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5750,8 +5750,10 @@
       -Af       R  R  R  R
       ========= == == == ==
 
-      Note that remove never deletes files in Added [A] state from the
-      working directory, not even if option --force is specified.
+      .. note::
+
+         :hg:`remove` never deletes files in Added [A] state from the
+         working directory, not even if ``--force`` is specified.
 
     Returns 0 on success, 1 if any warnings encountered.
     """
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -2437,8 +2437,11 @@
   <td>R</td></tr>
   </table>
   <p>
-  Note that remove never deletes files in Added [A] state from the
-  working directory, not even if option --force is specified.
+  <b>Note:</b> 
+  </p>
+  <p>
+  "hg remove" never deletes files in Added [A] state from the
+  working directory, not even if "--force" is specified.
   </p>
   <p>
   Returns 0 on success, 1 if any warnings encountered.


More information about the Mercurial-devel mailing list