help: update help for `hg update` which was misleading (
issue5427)
--- a/mercurial/commands.py Tue Jan 17 23:12:54 2017 -0500
+++ b/mercurial/commands.py Wed Jan 18 03:44:19 2017 +0530
@@ -6481,10 +6481,10 @@
changeset (see :hg:`help parents`).
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.
+ directory's parent and there are uncommitted changes, 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.
.. container:: verbose