equal
deleted
inserted
replaced
3 # Copyright 2008 David Soria Parra <dsp@php.net> |
3 # Copyright 2008 David Soria Parra <dsp@php.net> |
4 # |
4 # |
5 # This software may be used and distributed according to the terms of the |
5 # This software may be used and distributed according to the terms of the |
6 # GNU General Public License version 2, incorporated herein by reference. |
6 # GNU General Public License version 2, incorporated herein by reference. |
7 |
7 |
8 '''Mercurial bookmarks |
8 '''track a line of development with movable markers |
9 |
9 |
10 Bookmarks are local movable markers to changesets. Every bookmark |
10 Bookmarks are local movable markers to changesets. Every bookmark |
11 points to a changeset identified by its hash. If you commit a |
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 the bookmark shifts to the new changeset. |
13 the bookmark shifts to the new changeset. |
120 finally: |
120 finally: |
121 wlock.release() |
121 wlock.release() |
122 repo._bookmarkcurrent = mark |
122 repo._bookmarkcurrent = mark |
123 |
123 |
124 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, rename=None): |
124 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, rename=None): |
125 '''Mercurial bookmarks |
125 '''track a line of development with movable markers |
126 |
126 |
127 Bookmarks are pointers to certain commits that move when |
127 Bookmarks are pointers to certain commits that move when |
128 committing. Bookmarks are local. They can be renamed, copied and |
128 committing. Bookmarks are local. They can be renamed, copied and |
129 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 |
130 'hg update' to merge and update respectively to a given bookmark. |
130 'hg update' to merge and update respectively to a given bookmark. |