Rev 2314: (Johan Dahlberg) patch processor tracks current line to avoid problems with '--' lines in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2314
revision-id: pqm at pqm.ubuntu.com-20070305202715-ac49286871b5e2a8
parent: pqm at pqm.ubuntu.com-20070304031833-38a609e7e3fb3c5b
parent: john at arbash-meinel.com-20070305201256-zajdo4xfukjkc2x7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-05 20:27:15 +0000
message:
  (Johan Dahlberg) patch processor tracks current line to avoid problems with '--' lines
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
  bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20070305201256-zajdo4xfukjkc2x7
    parent: pqm at pqm.ubuntu.com-20070302224952-1f19efc6c320215f
    parent: johan_d at lysator.liu.se-20070303054731-8n4xac0g02tq3hkt
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Mon 2007-03-05 14:12:56 -0600
    message:
      (Johan Dahlberg) patch processor tracks current line to avoid problems with '--' lines
    ------------------------------------------------------------
    merged: johan_d at lysator.liu.se-20070303054731-8n4xac0g02tq3hkt
    parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
    committer: Johan Dahlberg <johan_d at lysator.liu.se>
    branch nick: bugfix75577
    timestamp: Sat 2007-03-03 14:47:31 +0900
    message:
      Fix bzrtools shelve command for removed lines beginning with "--"
       (Johan Dahlberg, bug #75577)