Mercurial > hg
comparison mercurial/commands.py @ 17143:c9e6c6ae4ea1 stable
update: move help text about parent revision higher up
emphasizing how important the parent revision is
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Tue, 10 Jul 2012 11:15:22 +0200 |
| parents | 3e66d00b3026 |
| children | 71e36b3d2cc4 |
comparison
equal
deleted
inserted
replaced
| 17142:3e66d00b3026 | 17143:c9e6c6ae4ea1 |
|---|---|
| 5610 Update the repository's working directory to the specified | 5610 Update the repository's working directory to the specified |
| 5611 changeset. If no changeset is specified, update to the tip of the | 5611 changeset. If no changeset is specified, update to the tip of the |
| 5612 current named branch and move the current bookmark (see :hg:`help | 5612 current named branch and move the current bookmark (see :hg:`help |
| 5613 bookmarks`). | 5613 bookmarks`). |
| 5614 | 5614 |
| 5615 Update sets the working directory's parent revison to the specified | |
| 5616 changeset (see :hg:`help parents`). | |
| 5617 | |
| 5615 If the changeset is not a descendant or ancestor of the working | 5618 If the changeset is not a descendant or ancestor of the working |
| 5616 directory's parent, the update is aborted. With the -c/--check | 5619 directory's parent, the update is aborted. With the -c/--check |
| 5617 option, the working directory is checked for uncommitted changes; if | 5620 option, the working directory is checked for uncommitted changes; if |
| 5618 none are found, the working directory is updated to the specified | 5621 none are found, the working directory is updated to the specified |
| 5619 changeset. | 5622 changeset. |
| 5620 | |
| 5621 Update sets the working directory's parent revison to the specified | |
| 5622 changeset (see :hg:`help parents`). | |
| 5623 | 5623 |
| 5624 The following rules apply when the working directory contains | 5624 The following rules apply when the working directory contains |
| 5625 uncommitted changes: | 5625 uncommitted changes: |
| 5626 | 5626 |
| 5627 1. If neither -c/--check nor -C/--clean is specified, and if | 5627 1. If neither -c/--check nor -C/--clean is specified, and if |