Mercurial > hg
changeset 29963:e824de573112
remove: specify hg in added warning
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Fri, 02 Sep 2016 21:46:00 +0000 |
| parents | 6b5a9a01f29d |
| children | 40f845537dca |
| files | mercurial/cmdutil.py tests/test-largefiles.t tests/test-remove.t |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Tue Sep 20 12:24:01 2016 -0700 +++ b/mercurial/cmdutil.py Fri Sep 02 21:46:00 2016 +0000 @@ -2509,8 +2509,8 @@ for f in added: count += 1 ui.progress(_('skipping'), count, total=total, unit=_('files')) - warnings.append(_('not removing %s: file has been marked for add' - ' (use forget to undo)\n') % m.rel(f)) + warnings.append(_("not removing %s: file has been marked for add" + " (use 'hg forget' to undo add)\n") % m.rel(f)) ret = 1 ui.progress(_('skipping'), None)
--- a/tests/test-largefiles.t Tue Sep 20 12:24:01 2016 -0700 +++ b/tests/test-largefiles.t Fri Sep 02 21:46:00 2016 +0000 @@ -112,7 +112,7 @@ normalnew already tracked! $ hg remove normalnew largenew not removing largenew: file is untracked - not removing normalnew: file has been marked for add (use forget to undo) + not removing normalnew: file has been marked for add (use 'hg forget' to undo add) [1] $ rm normalnew largenew $ hg up -Cq
--- a/tests/test-remove.t Tue Sep 20 12:24:01 2016 -0700 +++ b/tests/test-remove.t Fri Sep 02 21:46:00 2016 +0000 @@ -50,7 +50,7 @@ \r (no-eol) (esc) skipping [===========================================>] 1/1\r (no-eol) (esc) \r (no-eol) (esc) - not removing bar: file has been marked for add (use forget to undo) + not removing bar: file has been marked for add (use 'hg forget' to undo add) exit code: 1 A bar ./bar