comparison mercurial/commands.py @ 22315:188b8aa2120b

merge with crew
author Matt Mackall <mpm@selenic.com>
date Sat, 30 Aug 2014 18:44:59 +0200
parents 5038dee5bdd6 6a8b8efb0641
children c5df4af17110
comparison
equal deleted inserted replaced
22313:d226fe36e362 22315:188b8aa2120b
816 Bookmarks are labels on changesets to help track lines of development. 816 Bookmarks are labels on changesets to help track lines of development.
817 Bookmarks are unversioned and can be moved, renamed and deleted. 817 Bookmarks are unversioned and can be moved, renamed and deleted.
818 Deleting or moving a bookmark has no effect on the associated changesets. 818 Deleting or moving a bookmark has no effect on the associated changesets.
819 819
820 Creating or updating to a bookmark causes it to be marked as 'active'. 820 Creating or updating to a bookmark causes it to be marked as 'active'.
821 Active bookmarks are indicated with a '*'. 821 The active bookmark is indicated with a '*'.
822 When a commit is made, an active bookmark will advance to the new commit. 822 When a commit is made, the active bookmark will advance to the new commit.
823 A plain :hg:`update` will also advance an active bookmark, if possible. 823 A plain :hg:`update` will also advance an active bookmark, if possible.
824 Updating away from a bookmark will cause it to be deactivated. 824 Updating away from a bookmark will cause it to be deactivated.
825 825
826 Bookmarks can be pushed and pulled between repositories (see 826 Bookmarks can be pushed and pulled between repositories (see
827 :hg:`help push` and :hg:`help pull`). If a shared bookmark has 827 :hg:`help push` and :hg:`help pull`). If a shared bookmark has