Question

I have a project which has a subrepository linked to it and I'd like to branch my project, and also my subrepository so I can work on both and merge back from time to time.

I tried to branch the project's repository, branch the subrepository and change the .hgsub on my project's branch to point to my subrepository's branch.

But that doesn't seem to work, as I have to commit this .hgsub file, and when I tried to branch back from the main repository I couldn't because there were uncommited changes.

I'm confused, is there a way so I can have my project, linked to my subrepository and the just merge both back their parent repositories from time to time?

Answer 1

We have a similar problem. IMHO the problem is because using Kiln you have to use absolute subrepo paths like

Libraries\Subrepo = https://kiln.../subrepo

rather than relative paths like

Libraries\Subrepo = Libraries\Subrepo

The latter would seamlessly allow branching subrepos at the same time as the parent repo. Just about to log this as a feature request.

Answer 2

We solved the problem by just stopping to use the Subrepo extension and creating scripts do clone the sub repositories to their folders.