comparison mercurial/commands.py @ 15939:f57f891eb88e stable

bookmarks: clarify help for -i/--inactive
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 19 Jan 2012 16:05:01 -0600
parents 6c97eb445341
children 27f56b73522c
comparison
equal deleted inserted replaced
15938:f8272c70eb7f 15939:f57f891eb88e
743 743
744 Bookmarks can be pushed and pulled between repositories (see :hg:`help 744 Bookmarks can be pushed and pulled between repositories (see :hg:`help
745 push` and :hg:`help pull`). This requires both the local and remote 745 push` and :hg:`help pull`). This requires both the local and remote
746 repositories to support bookmarks. For versions prior to 1.8, this means 746 repositories to support bookmarks. For versions prior to 1.8, this means
747 the bookmarks extension must be enabled. 747 the bookmarks extension must be enabled.
748
749 With -i/--inactive, the new bookmark will not be made the active
750 bookmark. If -r/--rev is given, the new bookmark will not be made
751 active even if -i/--inactive is not given. If no NAME is given, the
752 current active bookmark will be marked inactive.
748 ''' 753 '''
749 hexfn = ui.debugflag and hex or short 754 hexfn = ui.debugflag and hex or short
750 marks = repo._bookmarks 755 marks = repo._bookmarks
751 cur = repo.changectx('.').node() 756 cur = repo.changectx('.').node()
752 757