##// END OF EJS Templates
update: put rules for uncommitted changes into verbose help section
Adrian Buehlmann -
r17218:b8661d7c default
parent child Browse files
Show More
@@ -5750,23 +5750,25 b' def update(ui, repo, node=None, rev=None'
5750 none are found, the working directory is updated to the specified
5750 none are found, the working directory is updated to the specified
5751 changeset.
5751 changeset.
5752
5752
5753 The following rules apply when the working directory contains
5753 .. container:: verbose
5754 uncommitted changes:
5754
5755
5755 The following rules apply when the working directory contains
5756 1. If neither -c/--check nor -C/--clean is specified, and if
5756 uncommitted changes:
5757 the requested changeset is an ancestor or descendant of
5757
5758 the working directory's parent, the uncommitted changes
5758 1. If neither -c/--check nor -C/--clean is specified, and if
5759 are merged into the requested changeset and the merged
5759 the requested changeset is an ancestor or descendant of
5760 result is left uncommitted. If the requested changeset is
5760 the working directory's parent, the uncommitted changes
5761 not an ancestor or descendant (that is, it is on another
5761 are merged into the requested changeset and the merged
5762 branch), the update is aborted and the uncommitted changes
5762 result is left uncommitted. If the requested changeset is
5763 are preserved.
5763 not an ancestor or descendant (that is, it is on another
5764
5764 branch), the update is aborted and the uncommitted changes
5765 2. With the -c/--check option, the update is aborted and the
5765 are preserved.
5766 uncommitted changes are preserved.
5766
5767
5767 2. With the -c/--check option, the update is aborted and the
5768 3. With the -C/--clean option, uncommitted changes are discarded and
5768 uncommitted changes are preserved.
5769 the working directory is updated to the requested changeset.
5769
5770 3. With the -C/--clean option, uncommitted changes are discarded and
5771 the working directory is updated to the requested changeset.
5770
5772
5771 To cancel an uncommitted merge (and lose your changes), use
5773 To cancel an uncommitted merge (and lose your changes), use
5772 :hg:`update --clean .`.
5774 :hg:`update --clean .`.
General Comments 0
You need to be logged in to leave comments. Login now