[PATCH] update: put rules for uncommitted changes into verbose help section
Adrian Buehlmann
adrian at cadifra.com
Sat Jul 14 11:36:12 CDT 2012
# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1342283386 -7200
# Node ID 61042022d29685f203642dcb7738f970a8b31184
# Parent 8299a9ad48dd46ca7ce5a405f06fa2dd16f1b236
update: put rules for uncommitted changes into verbose help section
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5710,23 +5710,25 @@
none are found, the working directory is updated to the specified
changeset.
- The following rules apply when the working directory contains
- 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
- uncommitted changes are preserved.
-
- 3. With the -C/--clean option, uncommitted changes are discarded and
- the working directory is updated to the requested changeset.
+ .. container:: verbose
+
+ The following rules apply when the working directory contains
+ 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
+ uncommitted changes are preserved.
+
+ 3. With the -C/--clean option, uncommitted changes are discarded and
+ the working directory is updated to the requested changeset.
To cancel an uncommitted merge (and lose your changes), use
:hg:`update --clean .`.
More information about the Mercurial-devel
mailing list