[PATCH 04 of 11] Clarify error message when removing newly added files

[Markus F.X.J. Oberhumer]

# HG changeset patch
# User Markus F.X.J. Oberhumer <markus at oberhumer.com>
# Date 1182775580 -7200
# Node ID 5812aebfd29e3774778ff5e3e2d6480d7b73350d
# Parent  698118ce38aa53350be929fd902140581311640c
Clarify error message when removing newly added files.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2177,7 +2177,7 @@ def remove(ui, repo, *pats, **opts):
             if opts['force']:
                 forget.append(abs)
                 continue
-            reason = _('has been marked for add (use -f to force removal)')
+            reason = _('has been marked for add (use -f to force untracking)')
         elif repo.dirstate.state(abs) == '?':
             reason = _('is not managed')
         elif opts['after'] and not exact and abs not in deleted:
diff --git a/tests/test-remove.out b/tests/test-remove.out
--- a/tests/test-remove.out
+++ b/tests/test-remove.out
@@ -49,7 +49,7 @@ diff -r 8ba83d44753d -r a1fce69c50d9 foo
 @@ -1,1 +0,0 @@
 -a
 
-not removing a: file has been marked for add (use -f to force removal)
+not removing a: file has been marked for add (use -f to force untracking)
 adding a
 adding b
 adding c/d