Question

I have created a branch and tag with the same name: 0.2.0. I have encountered some problems with merging, but managed to overcome them, using -r and providing explicit revision. So it is not my question what to do. Rather I would like to know: is it a suggested to have a different names for a branch and a tag, when a new version is produced? Are there any standard names for those tags and branches?

Answer 1

I would tag the code with version numbers like you do, e.g., 1.0, 2.0 and so on. For maintenance branches I would use 1.x, 2.x, etc.

The 1.1 tag would then be made on the 1.x branch and the 1.0 changeset is the fork point for the 1.x branch. It is not on the branch since you only create the 1.x branch when you need to make a 1.1 bugfix release.

Finally, you can use the revset language to distinguish between a tag and a branch:

$ hg log -r 'branch(foo)'
$ hg log -r 'tag(foo)'