--- a/mercurial/commands.py Wed Nov 11 20:08:26 2009 +0100
+++ b/mercurial/commands.py Tue Nov 10 22:27:31 2009 -0800
@@ -3149,11 +3149,13 @@
The following rules apply when the working directory contains
uncommitted changes:
- 1. If neither -c/--check nor -C/--clean is specified, uncommitted
- changes are merged into the requested changeset, and the merged result
- is left uncommitted. Updating and merging will occur only if the
- requested changeset is an ancestor or descendant of the parent
- changeset. Otherwise, the update is aborted and the uncommitted changes
+ 1. If neither -c/--check nor -C/--clean is specified, and if
+ the requested changeset is an ancestor or descendant of
+ the working directory's parent, the uncommitted changes
+ are merged into the requested changeset and the merged
+ result is left uncommitted. If the requested changeset is
+ not an ancestor or descendant (that is, it is on another
+ branch), the update is aborted and the uncommitted changes
are preserved.
2. With the -c/--check option, the update is aborted and the