Comment 3 for bug 370710

Revision history for this message
Martin von Gagern (gagern) wrote :

I assume that this bug here is the cause of the following error message:
bzr: ERROR: Cannot join <TREE>. Trees have the same root
According to "bzr file-id" the two trees involved both have TREE_ROOT as their root id as well.

Robert, could the change of tree root be performed as part of the join?
If doing so, would it still be possible to merge subsequent changes to the original tree into the joined tree, or would they have diverged due to the root rename?
In order to maintain mergability, from unjoined to both joined and unjoined trees, would one have to rename the root of one of the trees consistently in all its branches using that proposed script?
Would it make sense to allow users to specify the new root id as a config option to the upgrade command?