Comment 4 for bug 965403

Revision history for this message
Martin Pool (mbp) wrote : Re: [Bug 965403] [NEW] all bzr plugins use TREE_ROOT as their root-id as does bzr itself

On Tue, Mar 27, 2012 at 4:58 AM, Jelmer Vernooij
<email address hidden> wrote:
> The problem is that branches that were created with older versions of
> bzr and were later upgraded to a rich root format will all have a tree
> root with the file id "ROOT_ID". Two files with the same file id can't
> exist in the same tree, so if you try to join two such trees you will
> hit an error. An workaround is to change the root file id of one of
> them.
>
> Trees created in a rich root format immediately will have a
> unique root id.

Right, so I think a bug specifically about the bzr plugins is probably
invalid. The valid bug is that you can't merge trees created before
root ids were introduced -- I think there is a bug for that and this
is a dupe of it.