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

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Scott Scriven wrote:
> * 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.

Be aware that join is an unsupported command.  That's why it's hidden.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFItpFb0F+nu1YWqI0RAiJdAKCG0k+k6x6VNZfL7nwK0DuSp6+z3gCeMpO4
dHd9nediFcrDc9pDHUXOhfc=
=bf3Z
-----END PGP SIGNATURE-----