diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1572,10 +1572,15 @@ def export(ui, repo, *changesets, **opts doexport(ui, repo, cset, seqno, total, revwidth, opts) def forget(ui, repo, *pats, **opts): - """don't add the specified files on the next commit - + """don't add the specified files on the next commit (DEPRECATED) + + (DEPRECATED) Undo an 'hg add' scheduled for the next commit. + + This command is now deprecated and will be removed in a future + release. Please use revert instead. """ + ui.warn(_("(the forget command is deprecated; use revert instead)\n")) forget = [] for src, abs, rel, exact in walk(repo, pats, opts): if repo.dirstate.state(abs) == 'a': diff --git a/tests/test-help.out b/tests/test-help.out --- a/tests/test-help.out +++ b/tests/test-help.out @@ -49,7 +49,7 @@ list of commands (use "hg help -v" to sh copy mark files as copied for the next commit diff diff repository (or selected files) export dump the header and diffs for one or more changesets - forget don't add the specified files on the next commit + forget don't add the specified files on the next commit (DEPRECATED) grep search for a pattern in specified files and revisions heads show current repository heads help show help for a given command or all commands @@ -92,7 +92,7 @@ list of commands (use "hg help -v" to sh copy mark files as copied for the next commit diff diff repository (or selected files) export dump the header and diffs for one or more changesets - forget don't add the specified files on the next commit + forget don't add the specified files on the next commit (DEPRECATED) grep search for a pattern in specified files and revisions heads show current repository heads help show help for a given command or all commands diff --git a/tests/test-nested-repo.out b/tests/test-nested-repo.out --- a/tests/test-nested-repo.out +++ b/tests/test-nested-repo.out @@ -4,5 +4,6 @@ # should print A b/x A b/x # should forget b/x +(the forget command is deprecated; use revert instead) forgetting b/x # should print nothing