Aahhh! I'm seeing the light ;)
So, just to be clear (and document for others):
bzr join (w/o references): Not only combines the branches, but also handles the relative paths, such that further merges from both the original and the joined branch work fine.
merge-into: is superseded by "bzr branch & bzr join"?
Aahhh! I'm seeing the light ;)
So, just to be clear (and document for others):
bzr join (w/o references):
Not only combines the branches, but also handles the relative paths, such that further merges from both the original and the joined branch work fine.
merge-into:
is superseded by "bzr branch & bzr join"?