Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 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 |
comparison
equal
deleted
inserted
replaced
14540:944d9088da96 | 14541:07ee46a2ece3 |
---|---|
4087 _('[OPTION]... [-r REV] [NAME]...')) | 4087 _('[OPTION]... [-r REV] [NAME]...')) |
4088 def revert(ui, repo, *pats, **opts): | 4088 def revert(ui, repo, *pats, **opts): |
4089 """restore files to their checkout state | 4089 """restore files to their checkout state |
4090 | 4090 |
4091 .. note:: | 4091 .. note:: |
4092 This command is most likely not what you are looking for. | 4092 To check out earlier revisions, you should use :hg:`update REV`. |
4093 Revert will partially overwrite content in the working | 4093 To cancel a merge (and lose your changes), use :hg:`update --clean .`. |
4094 directory without changing the working directory parents. Use | |
4095 :hg:`update -r rev` to check out earlier revisions, or | |
4096 :hg:`update --clean .` to undo a merge which has added another | |
4097 parent. | |
4098 | 4094 |
4099 With no revision specified, revert the named files or directories | 4095 With no revision specified, revert the named files or directories |
4100 to the contents they had in the parent of the working directory. | 4096 to the contents they had in the parent of the working directory. |
4101 This restores the contents of the affected files to an unmodified | 4097 This restores the contents of the affected files to an unmodified |
4102 state and unschedules adds, removes, copies, and renames. If the | 4098 state and unschedules adds, removes, copies, and renames. If the |