[MERGE] Bugfix #55276: on win32 cat, bundle and diff commands provide binary output without mangling line-endings

Aaron Bentley aaron.bentley at utoronto.ca
Mon Dec 18 13:02:42 GMT 2006


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

Alexander Belchenko wrote:
> Aaron Bentley ?8H5B:
>>> With bundles, the metadata is utf-8 encoded, and the diffs are in
>>> whatever encoding each file is in.
> 
> Actually diff is a mess: chunks is bytestreams, and filenames is utf-8 encoded.
> It's a bad (for win32) but discussion in past go to deadlock.

I was talking about the diff portions of a bundle, not the diff itself.
 But yes, the output of "bzr diff" is like the output of "bzr bundle"--
metadata in utf-8, file contents handled as bytes.

> OK. I understand your point clear enough.
> I just want to be sure that in future 'exact' always means that
> output should be binary stream.

I consider transforming \n => \r\n to be an encoding.  So it would make
sense to me that 'exact' would not do that.  If we need a variant that
does do that, I'm sure we can write one.  But I'd rather not have two
variables to set, where one will do.

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

iD8DBQFFhpFy0F+nu1YWqI0RAk0GAKCE6fjrcJeCr2zj1IOx9rQGZVGpKACeNfMj
/jDn3IBMmtLc/a/JFQEpxaA=
=u8pz
-----END PGP SIGNATURE-----




More information about the bazaar mailing list