Show More
@@ -7,22 +7,24 b'' | |||||
7 |
|
7 | |||
8 | '''Mercurial bookmarks |
|
8 | '''Mercurial bookmarks | |
9 |
|
9 | |||
10 |
|
|
10 | Bookmarks are local movable markers to changesets. Every bookmark | |
11 |
|
|
11 | points to a changeset identified by its hash. If you commit a | |
12 |
changeset that is based on a changeset that has a bookmark on it, |
|
12 | changeset that is based on a changeset that has a bookmark on it, | |
13 |
bookmark |
|
13 | the bookmark shifts to the new changeset. | |
14 |
|
14 | |||
15 |
It is possible to use bookmark names in every revision lookup |
|
15 | It is possible to use bookmark names in every revision lookup | |
16 | merge, hg update). |
|
16 | (e.g. hg merge, hg update). | |
17 |
|
17 | |||
18 | The bookmark extension offers the possiblity to have a more git-like |
|
18 | By default, when several bookmarks point to the same changeset, they | |
19 | experience by adding the following configuration option to your .hgrc: |
|
19 | will all move forward together. It is possible to obtain a more | |
|
20 | git-like experience by adding the following configuration option to | |||
|
21 | your .hgrc: | |||
20 |
|
22 | |||
21 | [bookmarks] |
|
23 | [bookmarks] | |
22 | track.current = True |
|
24 | track.current = True | |
23 |
|
25 | |||
24 |
This will cause |
|
26 | This will cause Mercurial to track the bookmark that you are currently | |
25 |
|
|
27 | using, and only update it. This is similar to git's approach to | |
26 | branching. |
|
28 | branching. | |
27 | ''' |
|
29 | ''' | |
28 |
|
30 | |||
@@ -123,7 +125,7 b' def bookmark(ui, repo, mark=None, rev=No' | |||||
123 | '''Mercurial bookmarks |
|
125 | '''Mercurial bookmarks | |
124 |
|
126 | |||
125 | Bookmarks are pointers to certain commits that move when |
|
127 | Bookmarks are pointers to certain commits that move when | |
126 | commiting. Bookmarks are local. They can be renamed, copied and |
|
128 | committing. Bookmarks are local. They can be renamed, copied and | |
127 | deleted. It is possible to use bookmark names in 'hg merge' and |
|
129 | deleted. It is possible to use bookmark names in 'hg merge' and | |
128 | 'hg update' to merge and update respectively to a given bookmark. |
|
130 | 'hg update' to merge and update respectively to a given bookmark. | |
129 |
|
131 |
General Comments 0
You need to be logged in to leave comments.
Login now