Question

What is a good workflow for using mercurial with two long-running branches that are slightly divergent (i.e. I never intend to entirely merge them back
together)?

In my case, this is CMS software that has been customized differently for two
different web sites. I started with projectA, and once that was working cloned it to projectB and make further tweaks to both A and B to customize them. Now I want to develop some features that show up in both A and B, without merging the site-specific customizations. How?

hg push will push everything, so that won’t work
Transplant appears to give me different changeset hashes, which worries me

I feel like maybe the repositories should be set up differently, but I’m not
sure how.

Answer 1

As Thilo comments, the common part would be best developed (and published in A and B) as a third repo declared as a SubRepo.

That way, you respect the first two repos which are independent (one evolution on A doesn’t always mean an evolution on B), and you can develop the common part in subrepo C.