Mercurial > hg
changeset 14541:07ee46a2ece3
revert: simplify usage note
This points people looking for other commands to the right place with
a minimum of verbiage.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 07 Jun 2011 14:18:39 -0500 |
| parents | 944d9088da96 |
| children | afe0d4c24866 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Jun 06 17:38:32 2011 -0500 +++ b/mercurial/commands.py Tue Jun 07 14:18:39 2011 -0500 @@ -4089,12 +4089,8 @@ """restore files to their checkout state .. note:: - This command is most likely not what you are looking for. - Revert will partially overwrite content in the working - directory without changing the working directory parents. Use - :hg:`update -r rev` to check out earlier revisions, or - :hg:`update --clean .` to undo a merge which has added another - parent. + To check out earlier revisions, you should use :hg:`update REV`. + To cancel a merge (and lose your changes), use :hg:`update --clean .`. With no revision specified, revert the named files or directories to the contents they had in the parent of the working directory.