[MERGE] Merging from a previously joined branch will no longer cause a traceback.

[Jelmer Vernooij]

The attached patch fixes merging new revisions from a branch that was previously
joined into the current branch. It makes us avoid fixing the root if
the other tree's root appears as regular file id in the current tree.

This is bug 203376.

Cheers,

Jelmer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-dev-3650.patch
Type: text/x-diff
Size: 4872 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080827/1cd6d75b/attachment.bin