Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 17149:4b33422e2572

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Martin Geisler <mg@aragost.com>
date Thu, 12 Jul 2012 13:33:53 +0200
parents f7152a0d90df dd09bbd48646
children e058f4eec69c
comparison
equal deleted inserted replaced
17147:80e861511e2b 17149:4b33422e2572
4906 _('[OPTION]... [-r REV] [NAME]...')) 4906 _('[OPTION]... [-r REV] [NAME]...'))
4907 def revert(ui, repo, *pats, **opts): 4907 def revert(ui, repo, *pats, **opts):
4908 """restore files to their checkout state 4908 """restore files to their checkout state
4909 4909
4910 .. note:: 4910 .. note::
4911
4911 To check out earlier revisions, you should use :hg:`update REV`. 4912 To check out earlier revisions, you should use :hg:`update REV`.
4912 To cancel a merge (and lose your changes), use :hg:`update --clean .`. 4913 To cancel an uncommitted merge (and lose your changes), use
4914 :hg:`update --clean .`.
4913 4915
4914 With no revision specified, revert the specified files or directories 4916 With no revision specified, revert the specified files or directories
4915 to the contents they had in the parent of the working directory. 4917 to the contents they had in the parent of the working directory.
4916 This restores the contents of files to an unmodified 4918 This restores the contents of files to an unmodified
4917 state and unschedules adds, removes, copies, and renames. If the 4919 state and unschedules adds, removes, copies, and renames. If the