Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 16881:2255950e1f76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 06 Jun 2012 21:17:33 -0500
parents d566aa319d5f 6e578e77cbe6
children 0c9c41e53f1a
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Jun 05 22:46:14 2012 +0200
+++ b/mercurial/commands.py	Wed Jun 06 21:17:33 2012 -0500
@@ -5657,10 +5657,10 @@
     current named branch and move the current bookmark (see :hg:`help
     bookmarks`).
 
-    If the changeset is not a descendant of the working directory's
-    parent, the update is aborted. With the -c/--check option, the
-    working directory is checked for uncommitted changes; if none are
-    found, the working directory is updated to the specified
+    If the changeset is not a descendant or ancestor of the working
+    directory's parent, the update is aborted. With the -c/--check
+    option, the working directory is checked for uncommitted changes; if
+    none are found, the working directory is updated to the specified
     changeset.
 
     Update sets the working directory's parent revison to the specified