In the Merge dialog that opens, choose the target repository from the Repository list which shows all the Mercurial repositories available under the current project root.Ĭhoose the Branch or Bookmark option and choose the named branch or bookmark to merge the current working directory with. Commit or shelve the changes, if any.įrom the main menu, select Hg | Mercurial | Branches. Make sure, your current working directory is clean, that is, it does not contain any uncommitted changes. Merging a named branch or a bookmark with another named branch or bookmark means merging with its head. Merge a named branch or bookmark with another branch or bookmark If your current working copy is not clean, you can either commit the changes or shelve them as described in Shelve and unshelve changes. The message also recommends that you clean the current working directory by running the hg merge -C to discard the uncommitted changes. Otherwise the merge operation fails and PhpStorm shows the corresponding error message. īy default, Mercurial requires that before merge the current working directory should be clean, that is, it should not contain any uncommitted changes. You can merge a named branch or a bookmark with another named branch, another bookmark, or a specific changeset identified by a tag or a revision number.įor definitions and Mercurial-specific details regarding the merge operation itself, see. Select the Inactive option to remain in the current light-weight branch (bookmark) or named branch and switch to the new bookmark late.ĭisable the option to activate the new bookmark and enable tracking and updating the light-weight branch. In the New Bookmark dialog that opens, name the new bookmark. Bookmarks Create a bookmarkĬlick the Mercurial Branches widget in the status bar to open the Branches popup and click New Bookmark. Note that if you have several repositories listed in the Repositories section, the corresponding menu option will toggle to Close Branches and the close operation will be applied to all of them. All changes will be committed and the current branch will be closed. The Commit changes dialog will be displayed.Ĭlick Commit and Close. In the Branches popup, click Close branch. To close a branch, do the following:Ĭlick the Mercurial Branches widget in the status bar to open the Branches popup and click Close Branch. A closed branch is not displayed among active branches, in the Log view, and so on. In the Create New Branch dialog that opens, specify the name of the new branch.Īccording to Mercurial workflows, when you are done with a feature development and do not expect any further changes, you close the corresponding branch. The new branch immediately becomes active and its name is shown on the Mercurial Branches widget in the Status bar.Ĭlick the Mercurial Branches widget in the status bar to open the Branches popup and click New Branch. In the Status bar, click the Mercurial Branch widget.įrom the main menu, choose Hg | Mercurial | Branches.įrom the context menu of the editor or the Mercurial tool window, choose Mercurial | Branches. The name of the current named branch is shown in the Status bar. The current repository and the current bookmark are marked with a check mark. The popup shows all the Mercurial repositories under the project root, all the named branches, and all the bookmarks in them. Most of the operations with branches and bookmarks are invoked from the Branches popup. You can also run commands in the terminal.įor information about switching between branches and bookmarks, see Switch between Mercurial working directories. PhpStorm provides interface for creating, merging, and switching between branches and bookmarks, see Switch between Mercurial working directories. With PhpStorm, you can use both named branches and light-weight branches (bookmarks).
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |