Mercurial > hg-stable
diff mercurial/commands.py @ 22314:6a8b8efb0641 stable
bookmarks: refer to "the" active bookmark to clarify that there's only one
This is a follow-on to 0c6cdbb697d9 that just makes a slight clarification.
author | Kevin Bullock <kbullock@ringworld.org> |
---|---|
date | Sat, 30 Aug 2014 15:13:02 +0200 |
parents | 9472284df4eb |
children | 188b8aa2120b 816be4ca4ae2 |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Aug 27 23:10:06 2014 +0900 +++ b/mercurial/commands.py Sat Aug 30 15:13:02 2014 +0200 @@ -818,8 +818,8 @@ Deleting or moving a bookmark has no effect on the associated changesets. Creating or updating to a bookmark causes it to be marked as 'active'. - Active bookmarks are indicated with a '*'. - When a commit is made, an active bookmark will advance to the new commit. + The active bookmark is indicated with a '*'. + When a commit is made, the active bookmark will advance to the new commit. A plain :hg:`update` will also advance an active bookmark, if possible. Updating away from a bookmark will cause it to be deactivated.