![]() ![]() ![]() I’m not sure I fully understand the concept of tracking branches either, but that may come in time. I’m quite happy to pull them all, particularly as the remote ones are now well pruned and tidied. ![]() The biggest issue is the fact it wants to only pull/push a single branch. Git has some concepts with regards to branching that seem alien to me, though I am getting more used to them. So now I have all my history in unnamed branches (Git doesn’t have named branches) so at least it’s there if I need it but to find anything it might be simpler to look it up in Mercurial so I can track it down in Git. This was another surprise however I just renamed it to gitignore and it seems to work as expected. In fact when I tried to run GitFlow, it said there wasn’t a master branch and I had to create one before it would work.Īlso, in my case the hgignore file wasn’t converted. This surprised me as I was expecting all the HGFlow branches to still exist. Firstly everything seems to get pushed to a branch called HG. HOWEVER, as with all these things there are a few gotcha’s. Now set the remote to the bare git repo and push. For each repo I want to convert I add the following to. So to push I need to install HG-Git somewhere, in my case I just cloned the repo and use that, so that it’s trivial to pull down changes. ![]() From the perspective of a Mercurial user this is a rather quaint and arguably pointless concept. For those who don’t know what a bare repo is, it’s one that isn’t a working repo, it’s just used to push and pull from. As I have a central store for all my repos I first pushed to a bare git repo there so that I could clone to my machine. This was to my advantage as it meant I could use HG-git to simply push to a git repo. I structure my repos so that the Git ones are all in the same subfolder and similarly for the Mercurial ones and they are kept separate. For the remainder, I have used HG-Git in the past with limited success so I decided to take each repo in turn. NET Core/.NET Standard libraries, it was easier to just copy the code over into a new Git Repo. In some cases the answer was no, for a handful of. So the first question I had to ask myself was, do I need to keep the history. when I needed to clone something from Github, though I do also use SourceTree. My favoured Git Gui is Fork which I have been using for a while e.g. As a result, with some reluctance I have decided to start migrating to Git. Even BitBucket seems much more Git focused than it ever did before. These don’t really have a mercurial equivalent - or not one I have found that I can use. I’m thinking more of the automated tools such as GitVersion and GitReleaseNotes although I do also have to throw GitLens into the mix. I’m not particularly talking about integration into IDE’s, I don’t really mind dropping out of an IDE to perform some version control functions as it makes me pause for thought for a second. I’ve noticed recently, particularly with some of the tools that I use, that Git is becoming increasingly embedded and it’s becoming harder to get the same tooling for Mercurial. In effect, this is the same as multiple developers and as long as I remember to push to my central repos all is well. As I have a number of machines I sometimes work on one branch using one machine and a different branch on another machine. When work is complete they get closed and merged back. I use named branches which these days are created using HGFlow which uses the well documented generalized Driessen’s branching model. Other than that I find it straightforward to use, it has a choice of nice GUI’s to use and it’s easy to explain to new or casual users. My only real issue with it is that I haven’t found a way to squash commits that I am comfortable using. Most of the time I’m using it at a fairly simple level and I’ve rarely had a major issue with it though I did once have to help a novice user who had become incredibly tangled. I’ve used Mercurial for seven years now and I am reasonably comfortable with it. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |