Mercurial > hg
changeset 16740:43cfe56121d3
help: include bookmarks in 'help revisions' and simplify wording
| author | Kevin Bullock <kbullock@ringworld.org> |
|---|---|
| date | Wed, 16 May 2012 10:29:11 -0500 |
| parents | 4da10c00a20c |
| children | 77c9a78e31dd |
| files | mercurial/help/revisions.txt tests/test-help.t |
| diffstat | 2 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/help/revisions.txt Sun May 13 14:00:58 2012 +0200 +++ b/mercurial/help/revisions.txt Wed May 16 10:29:11 2012 -0500 @@ -12,13 +12,13 @@ identifier. A short-form identifier is only valid if it is the prefix of exactly one full-length identifier. -Any other string is treated as a tag or branch name. A tag name is a -symbolic name associated with a revision identifier. A branch name -denotes the tipmost revision of that branch. Tag and branch names must -not contain the ":" character. +Any other string is treated as a bookmark, tag, or branch name. A +bookmark is a movable pointer to a revision. A tag is a permanent name +associated with a revision. A branch name denotes the tipmost revision +of that branch. Bookmark, tag, and branch names must not contain the ":" +character. -The reserved name "tip" is a special tag that always identifies the -most recent revision. +The reserved name "tip" always identifies the most recent revision. The reserved name "null" indicates the null revision. This is the revision of an empty repository, and the parent of revision 0.
--- a/tests/test-help.t Sun May 13 14:00:58 2012 +0200 +++ b/tests/test-help.t Wed May 16 10:29:11 2012 -0500 @@ -733,13 +733,13 @@ short-form identifier is only valid if it is the prefix of exactly one full-length identifier. - Any other string is treated as a tag or branch name. A tag name is a - symbolic name associated with a revision identifier. A branch name denotes - the tipmost revision of that branch. Tag and branch names must not contain - the ":" character. + Any other string is treated as a bookmark, tag, or branch name. A bookmark + is a movable pointer to a revision. A tag is a permanent name associated + with a revision. A branch name denotes the tipmost revision of that + branch. Bookmark, tag, and branch names must not contain the ":" + character. - The reserved name "tip" is a special tag that always identifies the most - recent revision. + The reserved name "tip" always identifies the most recent revision. The reserved name "null" indicates the null revision. This is the revision of an empty repository, and the parent of revision 0.