Then perform a forced push:Īfterwards the original commit can be stripped if hg strip extension is enabled by right clicking the commit and selecting strip under modify history context menu. This will restore the original commit you had modified, move the bookmark to the tip of the newly created commit (only needed if using the deleted bookmarks workaround). Then restart TortoiseHg, and perform a pull. To activate a bookmark means this is the bookmark that will be automatically brought forward when you make your next commit.Īfter rewriting the public history under View > Show Console execute the command: In the bookmark dialog the new name field is used for renaming an existing bookmark to add a new bookmark enter the name under the bookmark field and click add. Hggit also creates a local tag labelled default/ to mimic git’s origin/ default is the alias name for the remote repository url as specified in the settings files. has no bookmark pointing to it or a descendant, will not get pushed or pulled (they will still appear in the outgoing changesets preview though but don’t actually get pushed). To use you move or add a new bookmark to the latest commit that’s represented by the branch. Hg can support Git style branches through the use of a feature called bookmarks and this is what hggit uses to represent Git branches. It also means you don’t have the problem of needing to resolve multiple heads on a branch like you do in Hg since a bookmark can only point to one commit so a branch will only ever have one head. This does allow branches to be created/deleted/renamed/moved without rewriting the commit history. Hg branches store the branch information as part of each commit, which Git does not support instead it just stores what the latest commit for the branch is in a separate file similar to tags. You cannot create branches the normal Hg way for a Git repo. Hggit = /path/hg-git/hggit or C:\path\hg-git\hggit So alternatively hggit can be manually installed by first cloning the repo: 1Īnd then under File > Settings > Edit File add the following: 1 There have been a couple of TortoiseHg releases in the past where the bundled version of hggit of didn’t work. TortoiseHg comes with hggit bundled so you can be enable it by going to File > Settings and then under the global settings tab and extensions option as seen in the screenshot below tick hggit and then restart TortoiseHg. To use you just prefix the source repository url with git e.g. There is a mercurial plugin called hggit that allows you to push and pull to/from a Git remote repository from Hg.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |