Mercurial > hg
changeset 15115:c84b3f42d5ae
remove: suggest forget to undo adds
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 16 Sep 2011 17:53:58 -0500 |
parents | d1bbabf7d35d |
children | d8501bcbb221 |
files | mercurial/commands.py tests/test-remove.t |
diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Sep 16 17:41:36 2011 -0500 +++ b/mercurial/commands.py Fri Sep 16 17:53:58 2011 -0500 @@ -4145,8 +4145,8 @@ ' to force removal)\n') % m.rel(f)) ret = 1 for f in added: - ui.warn(_('not removing %s: file has been marked for add (use -f' - ' to force removal)\n') % m.rel(f)) + ui.warn(_('not removing %s: file has been marked for add' + ' (use forget to undo)\n') % m.rel(f)) ret = 1 for f in sorted(list):
--- a/tests/test-remove.t Fri Sep 16 17:41:36 2011 -0500 +++ b/tests/test-remove.t Fri Sep 16 17:53:58 2011 -0500 @@ -29,7 +29,7 @@ $ echo b > bar $ hg add bar $ remove bar - not removing bar: file has been marked for add (use -f to force removal) + not removing bar: file has been marked for add (use forget to undo) exit code: 1 A bar ./bar