Mercurial: Combining or Folding Changesets
No matter how much you know, there’s always something more to learn. I was listening to this episode of HerdingCode, and was going to respond to the misinformation about Mercurial. I read the comments,...
View ArticleMercurial Polling for Jenkins Does Not Detect a Merge Change
The mercurial plugin for Jenkins won’t pick up Merge Changes on your project when polling. This is a known gap for the plugin. You have to manually trigger branch merges, or use notifications to...
View ArticleMercurial 2.1 Changes
Mercurial 2.1 has been released! The corresponding TortoiseHG is not up yet, but expect it in the next couple days. Two areas of interest for me. First, the number of corrections/bugfixes for...
View ArticleMercurial and TortoiseHG
For anyone on Windows using Mercurial and TortoiseHG 2.2.2, an issue has been noticed by various people when adding files. It appears there’s an issue with Windows and Mercurial case detection, and...
View ArticleMercurial Phases explained
Here’s a good explanation of why the new Phases feature is useful. Summary version: DVCS allow for history modification. Rebasing, combining changesets and various other things. If changesets have been...
View ArticleMercurial Revision Sets
Mercurial supports a functional language for selecting a set of revisions. You can do things like: Find the greatest common ancestor between two changesets: hg log -r "ancestor(2987, 1734)" Find all...
View ArticleThings That Can Be Done With Mercurial
Things that can be done with Mercurial. Have changes in working directory. Want to update to latest code but still have changes in working directory, just updated. Q: Do you think there will be major...
View ArticleMercurial Subrepositories
The basics The way subrepositories work is that you manually create a file .hgsub in the root of the parent repo’s working directory. Each line of this file maps a subdirectory location (relative to...
View ArticleMoving a Change From One Branch To Another With Mercurial
If you ever need to cherry pick a change from one branch to another with Mercurial, highly recommend the new graft command (added in HG 2.0). Much better than the transplant plugin as it uses the...
View ArticleMercurial “case-folding collision”
We ran into a problem recently that had to do with renaming a file in our code base. Essentially, we wanted to rename a file from “adhocThing.txt” to “adHocThing.txt”. The problem is that we develop...
View Article