# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1355092396 -3600
# Node ID 0c2f0048125de3f5299dd472e8121b981add898e
# Parent  6db1642288c0988c204b5085f6388d29c495d02a
rm: drop misleading 'use -f' hint for the rm --after 'not removing' warning

A warning mentioning 'forgetting' or 'recording delete' would be more correct
than 'not removing' but also more confusing.

diff -r 6db1642288c0 -r 0c2f0048125d mercurial/commands.py
--- a/mercurial/commands.py	Sun Dec 09 23:33:16 2012 +0100
+++ b/mercurial/commands.py	Sun Dec 09 23:33:16 2012 +0100
@@ -4880,8 +4880,7 @@
     elif after:
         list = deleted
         for f in modified + added + clean:
-            ui.warn(_('not removing %s: file still exists (use -f'
-                      ' to force removal)\n') % m.rel(f))
+            ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
             ret = 1
     else:
         list = deleted + clean
diff -r 6db1642288c0 -r 0c2f0048125d tests/test-remove.t
--- a/tests/test-remove.t	Sun Dec 09 23:33:16 2012 +0100
+++ b/tests/test-remove.t	Sun Dec 09 23:33:16 2012 +0100
@@ -107,7 +107,7 @@
   $ echo b > bar
   $ hg add bar
   $ remove -A bar
-  not removing bar: file still exists (use -f to force removal)
+  not removing bar: file still exists
   exit code: 1
   A bar
   ./bar
@@ -117,7 +117,7 @@
 21 state clean, options -A
 
   $ remove -A foo
-  not removing foo: file still exists (use -f to force removal)
+  not removing foo: file still exists
   exit code: 1
   ? bar
   ./bar
@@ -128,7 +128,7 @@
 
   $ echo b >> foo
   $ remove -A foo
-  not removing foo: file still exists (use -f to force removal)
+  not removing foo: file still exists
   exit code: 1
   M foo
   ? bar
@@ -220,7 +220,7 @@
 
   $ rm test/bar
   $ remove -A test
-  not removing test/foo: file still exists (use -f to force removal) (glob)
+  not removing test/foo: file still exists (glob)
   removing test/bar (glob)
   exit code: 1
   R test/bar