Plans for 0.9: bundle format

John Arbash Meinel john at arbash-meinel.com
Tue Jul 11 06:39:02 BST 2006


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

Matthieu Moy wrote:
> Aaron Bentley <aaron.bentley at utoronto.ca> writes:
> 
>> With john's binary fix, I'm not aware of any bugs in the format.  The
>> things we may want to do are aesthetic or nice-to have
> 
> I'd add (I've posted it on launchpad yesterday) :
> 
> A way for "bzr merge /path/to/bundle.patch" to identify the beginning
> and end of the bundle, so that, for example, piping a mail containing
> a bundle, or a gpg-signed bundle to "bzr merge -" can work.
> 
> At the moment, and extra newline at the end of bundle makes it
> unapplicable.
> 

Is it still that way with the latest bzr.dev? I cleaned up a lot of that
in a semi-recent patch. (I think around the time we went from 0.7 => 0.8
format bundles.)

I just did a test and it seemed to work. There seem to still be a couple
bugs if you remove the last newline (There is a place where I'm not
checking if _next_line is None).

But yes, one goal is to make it clearer when we do/don't have hunks left
to read. If we switch to one big base64 + bzip2 hunk at the bottom, this
is reasonably easy.

John
=:->

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

iD8DBQFEszl1JdeBCYSNAAMRAllMAKCl64rfZDy0nvu9QdKPgvUZONDkmACgq1xJ
CXKeCx4DTD/FemjpNy5JNw8=
=QqYZ
-----END PGP SIGNATURE-----




More information about the bazaar mailing list