Mercurial > hg
changeset 17218:b8661d7c940f
update: put rules for uncommitted changes into verbose help section
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Sat, 14 Jul 2012 18:29:46 +0200 |
| parents | 1b2b727a885f |
| children | 494a970f68de |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 19 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Fri Jul 06 18:41:25 2012 +0200 +++ b/mercurial/commands.py Sat Jul 14 18:29:46 2012 +0200 @@ -5750,23 +5750,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 .`.