My next attempt was to create a “master” bookmark right before I created the “SomeTopic” bookmark, so that “master” mimics the Git master branch – that is, it’s merely a named pointer, nothing special. What I’d really like to do is do “hg checkout default”, then do an update, so that “default” always represents the upstream current state. Now I want to pull those changes back to master…but wait, there is no master! I don’t have a pointer to when I first made the branch, and even worse, the “default” branch is now sitting on my SomeTopic branch. On the surface, Rebase and Bookmarks seem very similar to Git’s rebase and branching model. So my first try was using the Hg extensions Rebase and Bookmarks, which have both been included with Mercurial for a while now. So, I’m going from this article on the different ways of doing branching in Mercurial. I don’t really care how this is accomplished.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |