diff -r 4f5a6df2af92 -r 0e789549271d mercurial/commands.py --- a/mercurial/commands.py Sun Jul 18 01:06:50 2010 +0900 +++ b/mercurial/commands.py Wed Jul 14 18:28:12 2010 -0400 @@ -3779,8 +3779,8 @@ Update the repository's working directory to the specified changeset. - If no changeset is specified, attempt to update to the head of the - current branch. If this head is a descendant of the working + If no changeset is specified, attempt to update to the tip of the + current branch. If this changeset is a descendant of the working directory's parent, update to it, otherwise abort. The following rules apply when the working directory contains