Show More
@@ -795,31 +795,45 b' def bisect(ui, repo, rev=None, extra=Non' | |||
|
795 | 795 | ('i', 'inactive', False, _('mark a bookmark inactive'))], |
|
796 | 796 | _('hg bookmarks [OPTIONS]... [NAME]...')) |
|
797 | 797 | def bookmark(ui, repo, *names, **opts): |
|
798 | '''track a line of development with movable markers | |
|
799 | ||
|
800 | Bookmarks are pointers to certain commits that move when committing. | |
|
801 |
Bookmarks are |
|
|
802 | possible to use :hg:`merge NAME` to merge from a given bookmark, and | |
|
803 | :hg:`update NAME` to update to a given bookmark. | |
|
804 | ||
|
805 | You can use :hg:`bookmark NAME` to set a bookmark on the working | |
|
806 | directory's parent revision with the given name. If you specify | |
|
807 | a revision using -r REV (where REV may be an existing bookmark), | |
|
808 | the bookmark is assigned to that revision. | |
|
809 | ||
|
810 |
Bookmarks can be pushed and pulled between repositories (see |
|
|
811 | push` and :hg:`help pull`). This requires both the local and remote | |
|
812 | repositories to support bookmarks. For versions prior to 1.8, this means | |
|
813 | the bookmarks extension must be enabled. | |
|
814 | ||
|
815 | If you set a bookmark called '@', new clones of the repository will | |
|
816 | have that revision checked out (and the bookmark made active) by | |
|
817 | default. | |
|
818 | ||
|
819 | With -i/--inactive, the new bookmark will not be made the active | |
|
820 | bookmark. If -r/--rev is given, the new bookmark will not be made | |
|
821 | active even if -i/--inactive is not given. If no NAME is given, the | |
|
822 | current active bookmark will be marked inactive. | |
|
798 | '''create a new bookmark or list existing bookmarks | |
|
799 | ||
|
800 | Bookmarks are labels on changesets to help track lines of development. | |
|
801 | Bookmarks are unversioned and can be moved, renamed and deleted. | |
|
802 | Deleting or moving a bookmark has no effect on the associated changesets. | |
|
803 | ||
|
804 | Creating or updating to a bookmark causes it to be marked as 'active'. | |
|
805 | Active bookmarks are indicated with a '*'. | |
|
806 | When a commit is made, an active bookmark will advance to the new commit. | |
|
807 | A plain :hg:`update` will also advance an active bookmark, if possible. | |
|
808 | Updating away from a bookmark will cause it to be deactivated. | |
|
809 | ||
|
810 | Bookmarks can be pushed and pulled between repositories (see | |
|
811 | :hg:`help push` and :hg:`help pull`). If a shared bookmark has | |
|
812 | diverged, a new 'divergent bookmark' of the form 'name@path' will | |
|
813 | be created. Using :hg:'merge' will resolve the divergence. | |
|
814 | ||
|
815 | A bookmark named '@' has the special property that :hg:`clone` will | |
|
816 | check it out by default if it exists. | |
|
817 | ||
|
818 | .. container:: verbose | |
|
819 | ||
|
820 | Examples: | |
|
821 | ||
|
822 | - create an active bookmark for a new line of development:: | |
|
823 | ||
|
824 | hg book new-feature | |
|
825 | ||
|
826 | - create an inactive bookmark as a place marker:: | |
|
827 | ||
|
828 | hg book -i reviewed | |
|
829 | ||
|
830 | - create an inactive bookmark on another changeset:: | |
|
831 | ||
|
832 | hg book -r .^ tested | |
|
833 | ||
|
834 | - move the '@' bookmark from another branch:: | |
|
835 | ||
|
836 | hg book -f @ | |
|
823 | 837 | ''' |
|
824 | 838 | force = opts.get('force') |
|
825 | 839 | rev = opts.get('rev') |
@@ -290,7 +290,7 b' Testing -h/--help:' | |||
|
290 | 290 | archive create an unversioned archive of a repository revision |
|
291 | 291 | backout reverse effect of earlier changeset |
|
292 | 292 | bisect subdivision search of changesets |
|
293 | bookmarks track a line of development with movable markers | |
|
293 | bookmarks create a new bookmark or list existing bookmarks | |
|
294 | 294 | branch set or show the current branch name |
|
295 | 295 | branches list repository named branches |
|
296 | 296 | bundle create a changegroup file |
@@ -372,7 +372,7 b' Testing -h/--help:' | |||
|
372 | 372 | archive create an unversioned archive of a repository revision |
|
373 | 373 | backout reverse effect of earlier changeset |
|
374 | 374 | bisect subdivision search of changesets |
|
375 | bookmarks track a line of development with movable markers | |
|
375 | bookmarks create a new bookmark or list existing bookmarks | |
|
376 | 376 | branch set or show the current branch name |
|
377 | 377 | branches list repository named branches |
|
378 | 378 | bundle create a changegroup file |
@@ -55,7 +55,7 b' Short help:' | |||
|
55 | 55 | archive create an unversioned archive of a repository revision |
|
56 | 56 | backout reverse effect of earlier changeset |
|
57 | 57 | bisect subdivision search of changesets |
|
58 | bookmarks track a line of development with movable markers | |
|
58 | bookmarks create a new bookmark or list existing bookmarks | |
|
59 | 59 | branch set or show the current branch name |
|
60 | 60 | branches list repository named branches |
|
61 | 61 | bundle create a changegroup file |
@@ -131,7 +131,7 b' Short help:' | |||
|
131 | 131 | archive create an unversioned archive of a repository revision |
|
132 | 132 | backout reverse effect of earlier changeset |
|
133 | 133 | bisect subdivision search of changesets |
|
134 | bookmarks track a line of development with movable markers | |
|
134 | bookmarks create a new bookmark or list existing bookmarks | |
|
135 | 135 | branch set or show the current branch name |
|
136 | 136 | branches list repository named branches |
|
137 | 137 | bundle create a changegroup file |
@@ -687,7 +687,7 b' Test that default list of commands omits' | |||
|
687 | 687 | archive create an unversioned archive of a repository revision |
|
688 | 688 | backout reverse effect of earlier changeset |
|
689 | 689 | bisect subdivision search of changesets |
|
690 | bookmarks track a line of development with movable markers | |
|
690 | bookmarks create a new bookmark or list existing bookmarks | |
|
691 | 691 | branch set or show the current branch name |
|
692 | 692 | branches list repository named branches |
|
693 | 693 | bundle create a changegroup file |
@@ -952,7 +952,7 b' Test keyword search help' | |||
|
952 | 952 | |
|
953 | 953 | Commands: |
|
954 | 954 | |
|
955 | bookmarks track a line of development with movable markers | |
|
955 | bookmarks create a new bookmark or list existing bookmarks | |
|
956 | 956 | clone make a copy of an existing repository |
|
957 | 957 | paths show aliases for remote repositories |
|
958 | 958 | update update working directory (or switch revisions) |
@@ -1402,7 +1402,7 b' Dish up an empty repo; serve it cold.' | |||
|
1402 | 1402 | bookmarks |
|
1403 | 1403 | </a> |
|
1404 | 1404 | </td><td> |
|
1405 | track a line of development with movable markers | |
|
1405 | create a new bookmark or list existing bookmarks | |
|
1406 | 1406 | </td></tr> |
|
1407 | 1407 | <tr><td> |
|
1408 | 1408 | <a href="/help/branch"> |
General Comments 0
You need to be logged in to leave comments.
Login now