comparison hgext/bookmarks.py @ 8762:545dfd502e69

bookmarks: improve English
author timeless <timeless@gmail.com>
date Tue, 09 Jun 2009 09:25:25 -0400
parents bf17aeafb869
children cd96f159a2d3
comparison
equal deleted inserted replaced
8761:0289f384e1e5 8762:545dfd502e69
20 20
21 [bookmarks] 21 [bookmarks]
22 track.current = True 22 track.current = True
23 23
24 This will cause bookmarks to track the bookmark that you are currently 24 This will cause bookmarks to track the bookmark that you are currently
25 on, and just updates it. This is similar to git's approach of 25 on, and just updates it. This is similar to git's approach to
26 branching. 26 branching.
27 ''' 27 '''
28 28
29 from mercurial.i18n import _ 29 from mercurial.i18n import _
30 from mercurial.node import nullid, nullrev, hex, short 30 from mercurial.node import nullid, nullrev, hex, short
115 '''Mercurial bookmarks 115 '''Mercurial bookmarks
116 116
117 Bookmarks are pointers to certain commits that move when 117 Bookmarks are pointers to certain commits that move when
118 commiting. Bookmarks are local. They can be renamed, copied and 118 commiting. Bookmarks are local. They can be renamed, copied and
119 deleted. It is possible to use bookmark names in 'hg merge' and 119 deleted. It is possible to use bookmark names in 'hg merge' and
120 'hg update' to update to a given bookmark. 120 'hg update' to merge and update respectively to a given bookmark.
121 121
122 You can use 'hg bookmark NAME' to set a bookmark on the working 122 You can use 'hg bookmark NAME' to set a bookmark on the working
123 directory's parent revision with the given name. If you specify 123 directory's parent revision with the given name. If you specify
124 a revision using -r REV (where REV may be an existing bookmark), 124 a revision using -r REV (where REV may be an existing bookmark),
125 the bookmark is assigned to that revision. 125 the bookmark is assigned to that revision.