Rev 2399: Fix encoding bug generating error on already-versioned files in /home/pqm/archives/thelove/bzr/+trunk/

Wed Apr 4 15:05:26 BST 2007

------------------------------------------------------------
revno: 2399
revision-id: pqm at pqm.ubuntu.com-20070404140524-48cdc6512763399e
parent: pqm at pqm.ubuntu.com-20070404130151-7d01ccd3ef215fad
parent: aaron.bentley at utoronto.ca-20070404024116-8lm1319fn59e2eww
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-04-04 15:05:24 +0100
message:
  Fix encoding bug generating error on already-versioned files
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070404024116-8lm1319fn59e2eww
    parent: aaron.bentley at utoronto.ca-20070404023810-4gl2ygbehh15xjzn
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2007-04-03 22:41:16 -0400
    message:
      Update NEWS
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070404023810-4gl2ygbehh15xjzn
    parent: aaron.bentley at utoronto.ca-20070404023125-jvo5vuvzf170kpyw
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2007-04-03 22:38:10 -0400
    message:
      Fail if BzrError not raised
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070404023125-jvo5vuvzf170kpyw
    parent: aaron.bentley at utoronto.ca-20070404011502-cr6wqakuw9rgo1i4
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Tue 2007-04-03 22:31:25 -0400
    message:
      Fix encoding of 'already versioned' error