Using SourceTree with Hg, what's best way to add feature or fix to older release?

I use HgFlow with SourceTree. Say I have closed releases 2.4, 2.5, and 2.6 in this particular tree. Now I want to add a feature or fix to 2.4 that I already added to the later versions. 2.4 is the release that I actually have in production and I want to update that before I later release 2.6.

Using HgFlow, adding a HotFix can only be done to the latest Master Branch, not 2.4.

Using HgFlow, I also cannot add a New Release to 2.4.

Do just add a New Branch (not with HgFlow) to Master Branch 2.4 and go from there? I assume that way I end up with 2 Master Branches that can have tips.

Or, should I add a New Branch (not with HgFlow) to the Develop 2.4 node and go from there?

2 answers

The more I play with different paths with this on a test SourceTree repository, it looks like it would be best to checkout Master 2.4 and branch from there without using HgFlow, and when done applying that new feature or fix to the older version, checkout my Develop tip again and start working on the main project again using HgFlow.

This way I end up with 2 Master branches and the usual Develop branch.

Is that reasonable?

This looks more like adding a new Head instead of adding a new Master branch. Is this a way some people use Mercurial to go back and do some work on an older version in Master?

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

1,231 views 4 2
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you