Merging between projects

[Michael Hudson]

Tim Cook wrote:
> I have a project hosted on Launchpad (using bzr of course).  There is
> currently one branch that I would like to spin off (once it matures a
> bit) into it's own project.  But as the main project adds functionality;
> will I be able to do merges from the main project still?
> 
> Specifically the project is http://launchpad.net/oship
> and I will want to spin off the EpiS3 branch.. But retain the ability to
> merge new features form the oship trunk into the EpiS3 project.
> 
> Possible?

Yes.  If you only want to merge some changes from trunk to your spun off
branch you can either cherry pick revisions, or "null merge" the ones
you don't want.  https://answers.edge.launchpad.net/bzr/+question/23669
seems relevant.

Cheers,
mwh