Submitter | Kevin Bullock |
---|---|
Date | Aug. 30, 2014, 1:13 p.m. |
Message ID | <a9ef31ed0e1d540a94f5.1409404436@billings.local> |
Download | mbox | patch |
Permalink | /patch/5636/ |
State | Accepted |
Headers | show |
Comments
On Sat, 2014-08-30 at 15:13 +0200, Kevin Bullock wrote: > # HG changeset patch > # User Kevin Bullock <kbullock@ringworld.org> > # Date 1409404382 -7200 > # Sat Aug 30 15:13:02 2014 +0200 > # Node ID a9ef31ed0e1d540a94f5185c466992af7c0388fb > # Parent 6debcc5a5f74a8d4d535fac6bb043f2b64aae873 > bookmarks: refer to "the" active bookmark to clarify that there's only one Queued for stable, thanks.
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -818,8 +818,8 @@ def bookmark(ui, repo, *names, **opts): 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.