Rev 1806: (jam) fix #49182, ignore trailing whitespace in bundles in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1806
revision-id: pqm at pqm.ubuntu.com-20060622200147-08093baa0cf46599
parent: pqm at pqm.ubuntu.com-20060622183726-70f1e7cb560cf090
parent: john at arbash-meinel.com-20060622182425-6f45cb7acd587216
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-06-22 21:01:47 +0100
message:
  (jam) fix #49182, ignore trailing whitespace in bundles
modified:
  bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060622182425-6f45cb7acd587216
    parent: john at arbash-meinel.com-20060622173003-ab30e66758adc397
    parent: pqm at pqm.ubuntu.com-20060621145508-52a8077e9d1703de
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bundle-fixes
    timestamp: Thu 2006-06-22 13:24:25 -0500
    message:
      [merge] bzr.dev 1804 and fix conflicts.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060622173003-ab30e66758adc397
    parent: john at arbash-meinel.com-20060622171845-b14fa29a005c958a
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bundle-fixes
    timestamp: Thu 2006-06-22 12:30:03 -0500
    message:
      We now should handle trailing whitespace better (fix #49182).
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060622171845-b14fa29a005c958a
    parent: john at arbash-meinel.com-20060622165533-1711ab80583d7d04
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bundle-fixes
    timestamp: Thu 2006-06-22 12:18:45 -0500
    message:
      (failing) add some tests which munge trailing whitespace
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060622165533-1711ab80583d7d04
    parent: pqm at pqm.ubuntu.com-20060619195706-5f9f32cde3bcc4e6
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bundle-fixes
    timestamp: Thu 2006-06-22 11:55:33 -0500
    message:
      Clean up the bundle tests a little bit.