Rev 1579: small fixes in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1579
revision-id: pqm at pqm.ubuntu.com-20060309222250-8bc4180b1ba28f13
parent: pqm at pqm.ubuntu.com-20060309210459-a48571e310db5c23
parent: abentley at panoramicfeedback.com-20060309213704-2aed92beb0d3259e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-09 22:22:50 +0000
message:
  small fixes
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060309213704-2aed92beb0d3259e
    parent: abentley at panoramicfeedback.com-20060309170600-f47c647f127ea53a
    parent: pqm at pqm.ubuntu.com-20060309210459-a48571e310db5c23
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Thu 2006-03-09 16:37:04 -0500
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060309170600-f47c647f127ea53a
    parent: abentley at panoramicfeedback.com-20060309144012-40b703fe0d6541ad
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Thu 2006-03-09 12:06:00 -0500
    message:
      Merge_modified performance/concurrency fix
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060309144012-40b703fe0d6541ad
    parent: abentley at panoramicfeedback.com-20060309143308-9ef11e32a83c4fed
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Thu 2006-03-09 09:40:12 -0500
    message:
      Revert in checkout works properly
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060309143308-9ef11e32a83c4fed
    parent: abentley at panoramicfeedback.com-20060307184118-b18cf90f2bf4e6d8
    parent: pqm at pqm.ubuntu.com-20060309085048-37f21fd146dabe93
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Thu 2006-03-09 09:33:08 -0500
    message:
      Merge from mainline