--- a/mercurial/commands.py Wed Jun 06 16:44:17 2012 +0100
+++ b/mercurial/commands.py Tue Jun 05 13:33:52 2012 -0500
@@ -5607,10 +5607,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