[MERGE] rip off the trailing whitespace band-aid

[Aaron Bentley]

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

Marius Kruger wrote:
> thanks Matt hopefully it works now, I tried:
> bzr send -o ../2009-01/20090118_2008-bzr.code_style_cleanup.patch
> http://bazaar-vcs.org/bzr/bzr.dev/
> bzr+ssh://bazaar.launchpad.net/%7Eamanica/bzr/code_style_cleanup/
> <http://bazaar.launchpad.net/%7Eamanica/bzr/code_style_cleanup/>
> --no-bundle --no-patch
> 
> (I also tried sending the full merge directive but because its so big,
> its been held for moderation and I'm not sure it made it through yet.)

Did you hand-hack the merge directive at all?

It kept giving me:
Traceback (most recent call last):
  File "/opt/BundleBuggy/bundlebuggy/jobs.py", line 104, in handle_mail
    result = parse_request(mail_file, slushpile)
  File "/opt/BundleBuggy/bundlebuggy/requests.py", line 264, in
parse_request
    req = handle_merge_request(message, needs_patch, slushpile, _config)
  File "/opt/BundleBuggy/bundlebuggy/requests.py", line 202, in
handle_merge_request
    patch_data = find_patch(part_iter, slushpile)
  File "/opt/BundleBuggy/bundlebuggy/requests.py", line 102, in find_patch
    patch_data = get_patch_data(output, slushpile, filename)
  File "/opt/BundleBuggy/bundlebuggy/requests.py", line 123, in
get_patch_data
    md = MergeDirective.from_lines(stripped_output.splitlines(True))
  File "/opt/BundleBuggy/bzrlib/merge_directive.py", line 320, in from_lines
    return _format_registry.get(line[2:].rstrip())._from_lines(line_iter)
  File "/opt/BundleBuggy/bzrlib/merge_directive.py", line 407, in
_from_lines
    stanza = rio.read_patch_stanza(line_iter)
  File "/home/abentley/bzr.dev/bzrlib/rio.py", line 401, in
read_patch_stanza
  File "/home/abentley/bzr.dev/bzrlib/rio.py", line 258, in read_stanza
  File "/home/abentley/bzr.dev/bzrlib/rio.py", line 286, in
read_stanza_unicode
  File "/home/abentley/bzr.dev/bzrlib/rio.py", line 257, in <genexpr>
  File "/home/abentley/bzr.dev/bzrlib/rio.py", line 385, in
_patch_stanza_iter
IndexError: string index out of rang


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

iEYEARECAAYFAkl0rPAACgkQ0F+nu1YWqI0WhQCeJ63TFllmYvm1W4OprCLygtmF
hpsAn0ikUkgWYsgYV0RBxYWzpqi3pIl7
=MmYR
-----END PGP SIGNATURE-----