Rev 1808: Ensure that crlf bundles don't cause path to be treated as branch in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1808
revision-id: pqm at pqm.ubuntu.com-20060623180910-c45d7b3db60625f7
parent: pqm at pqm.ubuntu.com-20060623155016-476962c2dd4938a2
parent: abentley at panoramicfeedback.com-20060621204144-6a6b715b0f2508a0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-06-23 19:09:10 +0100
message:
  Ensure that crlf bundles don't cause path to be treated as branch
modified:
  bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060621204144-6a6b715b0f2508a0
    parent: abentley at panoramicfeedback.com-20060621203051-258791fb09456b01
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bundles
    timestamp: Wed 2006-06-21 16:41:44 -0400
    message:
      Whitespace/comment fix
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060621203051-258791fb09456b01
    parent: abentley at panoramicfeedback.com-20060621152339-e73b18b1ca3d08e2
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bundles
    timestamp: Wed 2006-06-21 16:30:51 -0400
    message:
      Don't use assertNotRaises-- instead, catch BadBundle and pass
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060621152339-e73b18b1ca3d08e2
    parent: abentley at panoramicfeedback.com-20060621150240-f0e4981af656ddec
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bundles
    timestamp: Wed 2006-06-21 11:23:39 -0400
    message:
      Clean up assertNotRaises
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060621150240-f0e4981af656ddec
    parent: abentley at panoramicfeedback.com-20060621133730-6f6f965f4d2e3743
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bundles
    timestamp: Wed 2006-06-21 11:02:40 -0400
    message:
      Fix reporting of malformed, (especially, crlf) bundles