[MERGE] Test for bug #272444 (symlinks to Unicode file names)

[Aaron Bentley]

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

Daniel Clemente wrote:

bb:approve
>   I based the new changes on the old patch, but rather manually (since I had to apply to bundle at other computer). I don't know if Bundle Buggy will detect that this one supersedes the old one.

You can always just "bzr pull
'http://bundlebuggy.aaronbentley.com/download_patch/%3C871vzcdom9.fsf@yahoo.com%3E'".

I think you're confusing merge directives with bundles, but both bundles
and merge directives can be merged or pulled.

>   I'm not sure I have used bzrlib's API correctly. Please improve it or give some advice.

I think it's okay.  It seems a little strange to set the parents to
[first_revision, second_revision], but this can actually happen when
merging, so that's fine.

>   The old test (with self.run_bzr) failed with WorkingTreeFormat4, WorkingTreeFormat3 and WorkingTreeFormat2. This one only fails with WorkingTreeFormat4 only. Maybe it is testing too few things.

Your original test was a test of "bzr branch", and this is implemented
using BzrDir.sprout.  It would be reasonable to test BzrDir.sprout as well.

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

iD8DBQFI6jsc0F+nu1YWqI0RAjLeAJ0ZYzIC0Whz95DUsgvGxLXjZqIyAACeKPnn
9r87tGbvUeDms3CppvI8i40=
=TVOw
-----END PGP SIGNATURE-----