Rev 2325: fixes for 0.15 in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2325
revision-id: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
parent: abentley at panoramicfeedback.com-20070307231535-3nfhj93n3c5xpft2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-07 23:31:24 +0000
message:
  fixes for 0.15
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tests/test_delta.py     test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
  bzrlib/tests/workingtree_implementations/test_nested_specifics.py test_nested_specific-20070306004443-qut978c488jr11sg-1
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070307231535-3nfhj93n3c5xpft2
    parent: abentley at panoramicfeedback.com-20070307231510-jae63zsli83db3eb
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2007-03-07 18:15:35 -0500
    message:
      Allow extract when tree is locked
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070307231510-jae63zsli83db3eb
    parent: abentley at panoramicfeedback.com-20070307231436-0bm7927iwy285un0
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2007-03-07 18:15:10 -0500
    message:
      Make ChangeReporter private
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070307231436-0bm7927iwy285un0
    parent: aaron.bentley at utoronto.ca-20070301025337-ao2ls9hmiscidfg8
    parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2007-03-07 18:14:36 -0500
    message:
      Merge from bzr.dev