[MERGE] Merging from a previously joined branch will no longer cause a traceback.
bzr at toykeeper.net
Thu Aug 28 12:31:46 BST 2008
* Jelmer Vernooij <jelmer at samba.org> wrote:
> 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.
Thanks for the quick fix. I've verified it works on the branches
where I found the bug.
More information about the bazaar