Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 19225:6cf8e3b4e074
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 21 May 2013 15:32:15 -0500 |
parents | 3bfd7f1e7485 2b4344f23b44 |
children | 7bbad79b9542 |
comparison
equal
deleted
inserted
replaced
19216:0ec31231afad | 19225:6cf8e3b4e074 |
---|---|
4933 def revert(ui, repo, *pats, **opts): | 4933 def revert(ui, repo, *pats, **opts): |
4934 """restore files to their checkout state | 4934 """restore files to their checkout state |
4935 | 4935 |
4936 .. note:: | 4936 .. note:: |
4937 To check out earlier revisions, you should use :hg:`update REV`. | 4937 To check out earlier revisions, you should use :hg:`update REV`. |
4938 To cancel an uncommitted merge (and lose your changes), use | 4938 To cancel an uncommitted merge (and lose your changes), |
4939 :hg:`update --clean .`. | 4939 use :hg:`update --clean .`. |
4940 | 4940 |
4941 With no revision specified, revert the specified files or directories | 4941 With no revision specified, revert the specified files or directories |
4942 to the contents they had in the parent of the working directory. | 4942 to the contents they had in the parent of the working directory. |
4943 This restores the contents of files to an unmodified | 4943 This restores the contents of files to an unmodified |
4944 state and unschedules adds, removes, copies, and renames. If the | 4944 state and unschedules adds, removes, copies, and renames. If the |