[PATCH] remove: fix --force option help description (issue5177)

liscju piotr.listkiewicz at gmail.com
Wed Apr 13 03:59:48 EDT 2016


# HG changeset patch
# User liscju <piotr.listkiewicz at gmail.com>
# Date 1460534211 -7200
#      Wed Apr 13 09:56:51 2016 +0200
# Node ID 8636e5421aeae9457fc298f0af3268f371484e03
# Parent  02be5fc18c0c70c087a9d1ab5ffe5afce926f227
remove: fix --force option help description (issue5177)

Before this commit --force option help description stated
that file was removed and deleted even if file was added
or modified which is not true. Force option removes added
file only from dirstate, it doesn't delete it from the
filesystem.

diff -r 02be5fc18c0c -r 8636e5421aea mercurial/commands.py
--- a/mercurial/commands.py	Wed Mar 09 10:47:33 2016 -0500
+++ b/mercurial/commands.py	Wed Apr 13 09:56:51 2016 +0200
@@ -5975,7 +5975,7 @@ def recover(ui, repo):
 @command('^remove|rm',
     [('A', 'after', None, _('record delete for missing files')),
     ('f', 'force', None,
-     _('remove (and delete) file even if added or modified')),
+     _('remove file if added and also delete if modified')),
     ] + subrepoopts + walkopts,
     _('[OPTION]... FILE...'),
     inferrepo=True)
diff -r 02be5fc18c0c -r 8636e5421aea tests/test-help.t
--- a/tests/test-help.t	Wed Mar 09 10:47:33 2016 -0500
+++ b/tests/test-help.t	Wed Apr 13 09:56:51 2016 +0200
@@ -2551,7 +2551,7 @@ Dish up an empty repo; serve it cold.
   <td>record delete for missing files</td></tr>
   <tr><td>-f</td>
   <td>--force</td>
-  <td>remove (and delete) file even if added or modified</td></tr>
+  <td>remove file if added and also delete if modified</td></tr>
   <tr><td>-S</td>
   <td>--subrepos</td>
   <td>recurse into subrepositories</td></tr>


More information about the Mercurial-devel mailing list