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

[John Arbash Meinel]

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

Jelmer Vernooij 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.
> 
> Cheers,
> 
> Jelmer
> 

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

iD8DBQFItrk8JdeBCYSNAAMRAuDbAJ0fwGGvy3bSQAqwr1oT9cS/AAOkmQCcC48X
qAb3fRoyPnPhnrxxiQL+Gqo=
=LJkn
-----END PGP SIGNATURE-----