[PATCH 1 of 3 V3] update: move help text about parent revision higher up
Adrian Buehlmann
adrian at cadifra.com
Tue Jul 10 04:46:46 CDT 2012
# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1341911722 -7200
# Node ID bbfbdd2517018c3d0f3e6e923f835ab611bce141
# Parent 5d6cbfa975bf2ad0a7b005287617e91e4c38b7b3
update: move help text about parent revision higher up
emphasizing how important the parent revision is
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5690,15 +5690,15 @@
current named branch and move the current bookmark (see :hg:`help
bookmarks`).
+ Update sets the working directory's parent revison to the specified
+ 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.
- Update sets the working directory's parent revison to the specified
- changeset (see :hg:`help parents`).
-
The following rules apply when the working directory contains
uncommitted changes:
More information about the Mercurial-devel
mailing list