Merge lp://staging/~vila/bzr/805809-no-final-path into lp://staging/bzr/2.2

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

On 7/5/2011 11:19 AM, Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr/805809-no-final-path into lp:bzr/2.2.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> Bug #805809 in Bazaar: "merge fails with NoFinalPath"
> https://bugs.launchpad.net/bzr/+bug/805809
>
> For more details, see:
> https://code.launchpad.net/~vila/bzr/805809-no-final-path/+merge/66868
>
> The path conflicts involving the root-ids are still a bit obscure
> but roughly in this case, we don't inject the root path for the
> branch we are merging from in the tree transform (and I can't see
> why we should).
>
> The fix is minimal as I target 2.2 but I'm not sure it's worth
> digging for a better fix for now.
>
> I'll check what will happen when merging up in 2.3 and 2.4 but
> some earlier tests showed that the fix is valid for trunk too.
>
> The "bad" news is that this will require a bzr upgrade on jubany
> to fix the corresponding failures (31), but I'll care about that
> once this patch has landed.
>

- - parent_path = fp.get_path(
- - self.tt.trans_id_file_id(other_parent))
+ if other_parent == self.other_tree.get_root_id():
+ # The tree transform don't know about the other
root,
+ # so we special case here to avoid a NoFinalPath
+ # exception
+ parent_path = ''

^- "doesn't know about"

 merge: approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk4S3DkACgkQJdeBCYSNAAOUzgCfdnwcNATvOnd40oqy1N4DJrZZ
aZgAoMCGCU8ZfufSZOOTSNPqA0dXjq4q
=b6VC
-----END PGP SIGNATURE-----

sent to pqm by email