[MERGE] submit branch support for bundle

Aaron Bentley aaron.bentley at utoronto.ca
Thu Jun 22 17:24:28 BST 2006


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

Erik Bågfors wrote:
> When I try to merge this, with a current bzr.dev (1804). I get

> : [bagfors at zyrgelkwyt]$ ; ../bzr.dev/bzr merge
> ~/Desktop/bundle-submit.patch
> bzr: ERROR: exceptions.TypeError: float() argument must be a string or a
> number

Your copy of the bundle has been munged somehow.  Probably not enough
vertical whitespace or too much vertical whitespace.

The parser needs to be fixed so it's not as sensitive, but it does work
properly with valid bundles.  Here is a gzipped copy, which your mailer
is unlikely to damage.

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

iD8DBQFEmsQ80F+nu1YWqI0RAj6AAJ99sLU0AWRjxvmRUeSa6GUucxC4xwCfbrE5
bwqykOHxnmoPNunMaTKP1K8=
=BN+/
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bundle-submit.patch.gz
Type: application/x-gzip
Size: 1809 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060622/889c704f/attachment.bin 


More information about the bazaar mailing list