For this example we will use the main mercurial repository. Start with an existing Mercurial repository. Let’s give you a short example how bookmarks work. or with a number if the remote isn't listed in (e.g. If there is a divergence between shared remote and local bookmarks, Mercurial will mark the incoming bookmark either with the path alias (e.g. Prior to that, only bookmarks present on both the local and remote repositories were updated on pull. As of Mercurial 2.3, all remote bookmarks are updated on pull.
This is done to keep your local bookmarks local until you manually publish them. However only bookmarks that are present on both the local and the remote repositories are updated on push. When you clone a repository, all remote bookmarks are transferred. They are not part of committed changes but they can be transferred between repositories using the pushkey protocol. The bookmarked head can be stripped (using hg strip, supplied with the mq extension).īookmarks are stored in an untracked file called. The unwanted changes will remain in the repository. Note however that while bookmarks can be deleted using hg bookmark -delete feature, this merely removes the bookmark feature, not the changes it points to. If the new features don't work out, development can be re-started from an old changeset.
#Tortoisehg tag vs bookmark update#
Bookmarks can be used to access the commit whenever a usual lookup is allowed (wherever a command takes -r revision, revision can be a bookmark name), therefore you can merge and update bookmarks by their names. They can therefore be used for trying out new features or pulling changes that have yet to be reviewed.
Since active bookmarks are automatically updated when committing to the changeset they are pointing to, they are especially useful to keep track of different heads. if the feature bookmark points to revision #20 and you do hg update -rev 20 the feature bookmark will not be activated). Note that updating to a revision that has a bookmark without using the bookmark name will not activate the bookmark (e.g. hg update -rev feature updates to the revision pointed to by feature and activates the feature bookmark as well). A given bookmark can be activated by updating to that bookmark (e.g. The currently active bookmark can be inactivated by executing hg bookmark -inactive. When a bookmark is created it is active by default, but an inactive bookmark can be created by passing the -inactive (or -i) flag. This is similar to Git's approach to branching and can be used to replicate the traditional Git branching workflow. Mercurial only tracks and updates the currently active bookmark (if there is any). Only a single bookmark can be active at any given time, and only a bookmark that points to the current revision can be active. Mercurial's bookmark feature is analogous to Git's branching scheme, but can also be used in conjunction with Mercurial's traditional named branches.īookmarks can be active or inactive. Git, by contrast, has "branches" that are not stored in history, which is useful for working with numerous short-lived feature branches, but makes future auditing impossible. This is useful for future auditing of long-lived branches, as it's always possible to identify which branch a commit was introduced on. Systems like Mercurial, CVS, and Subversion store their branch information as a permanent part of each commit. The bookmark will always point to the latest revision in your line of work.īookmarks can be used as an alternative to NamedBranches for tracking multiple lines of development. As you work and commit changes the bookmark will move forward with every commit you do. If you run hg bookmark feature, the feature bookmark refers to the current changeset. Bookmarks are references to commits that can be automatically updated when new commits are made.
0 kommentar(er)
