[MERGE] submit branch support for bundle

[John Arbash Meinel]

Erik Bågfors wrote:
> On 6/22/06, Aaron Bentley <aaron.bentley at utoronto.ca> 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

That is the 'bundles are too sensitive to whitespace' bug.

https://launchpad.net/products/bzr/+bug/49182

Just strip the whitespace at the bottom of the file so there is exactly
1 blank line.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060622/3cf3bb49/attachment.pgp