Rev 2333: Add + kind marker for tree references in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2333
revision-id: pqm at pqm.ubuntu.com-20070310212110-7853e75061cf66d6
parent: pqm at pqm.ubuntu.com-20070310050104-4c59f87cee46be60
parent: aaron.bentley at utoronto.ca-20070310203558-8dptj9p637ypat0f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-10 21:21:10 +0000
message:
  Add + kind marker for tree references
modified:
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070310203558-8dptj9p637ypat0f
    parent: aaron.bentley at utoronto.ca-20070310031259-8n5spbsxrhik2dp7
    parent: pqm at pqm.ubuntu.com-20070310050104-4c59f87cee46be60
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sat 2007-03-10 15:35:58 -0500
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070310031259-8n5spbsxrhik2dp7
    parent: aaron.bentley at utoronto.ca-20070308023327-cg1hnu5y8mh090n9
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Fri 2007-03-09 22:12:59 -0500
    message:
      Fix tree.list_files when file kind changes
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070308023327-cg1hnu5y8mh090n9
    parent: aaron.bentley at utoronto.ca-20070308005121-qdrfp0xmi5xu3fvi
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2007-03-07 21:33:27 -0500
    message:
      change kind marker to '+'
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070308005121-qdrfp0xmi5xu3fvi
    parent: abentley at panoramicfeedback.com-20070307231535-3nfhj93n3c5xpft2
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2007-03-07 19:51:21 -0500
    message:
      Add a kind marker for subtrees