utf8 file ids addendum

[John Arbash Meinel]

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

Just as a small follow on to my 'unicode_id_warnings' patch, Aaron's new
'auto-resolve' exposed a leak in the Conflicts api. It was passing
around Unicode file ids, which were then used by auto-resolve, and
triggering the new warnings.

So this small patch updates Conflicts to properly encode and decode file
ids when it needs to.

It also updates the conflicts test suite to make sure that it properly
round trips unicode paths and utf8 file ids.

There was also a small bug in the test suite, where one of the classes
was not initialized properly, and this was not caught because the test
was skipping improperly.

I'm going to be submitting this with my other fix, since it is in the
same vein, but I wanted people to be aware of it.

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

iD8DBQFF7YyNJdeBCYSNAAMRAqz6AKDP3Jv/0GZ7q+t0DfL+yXWQ2i75XgCfXK8E
rYnPSSk/IsM7xCrUPjGWJtY=
=8Gil
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: utf8_conflicts.patch
Type: text/x-patch
Size: 13121 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070306/2d14780b/attachment-0001.bin