Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove: fix --force option help description (issue5177)
authorliscju <piotr.listkiewicz@gmail.com>
Wed, 13 Apr 2016 09:56:51 +0200
changeset 28902 eb017d52899d
parent 28901 a368da441b32
child 28903 e1dd0de26557
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.
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-help.t file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Tue Apr 05 17:39:59 2016 +0100
+++ b/mercurial/commands.py	Wed Apr 13 09:56:51 2016 +0200
@@ -5968,7 +5968,7 @@
 @command('^remove|rm',
     [('A', 'after', None, _('record delete for missing files')),
     ('f', 'force', None,
-     _('remove (and delete) file even if added or modified')),
+     _('forget added files, delete modified files')),
     ] + subrepoopts + walkopts,
     _('[OPTION]... FILE...'),
     inferrepo=True)
--- a/tests/test-help.t	Tue Apr 05 17:39:59 2016 +0100
+++ b/tests/test-help.t	Wed Apr 13 09:56:51 2016 +0200
@@ -2551,7 +2551,7 @@
   <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>forget added files, delete modified files</td></tr>
   <tr><td>-S</td>
   <td>--subrepos</td>
   <td>recurse into subrepositories</td></tr>
Mercurial