Rev 1544: Merge mainline. in /home/robertc/source/baz/integration/

[Robert Collins]

------------------------------------------------------------
revno: 1544
revision-id: robertc at robertcollins.net-20060221224858-2b61aaa0f1636293
parent: robertc at robertcollins.net-20060221224144-83aef6ec91b8a5dc
parent: pqm at pqm.ubuntu.com-20060221212748-e81c0691edf46b65
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-02-22 09:48:58 +1100
message:
  Merge mainline.
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060221212748-e81c0691edf46b65
    parent: pqm at pqm.ubuntu.com-20060221211130-87707824495dc833
    parent: abentley at panoramicfeedback.com-20060221212021-98bc6d0d4a1e7639
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-02-21 21:27:48 +0000
    message:
      Added progress bars to tree-changing operations
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060221212021-98bc6d0d4a1e7639
    parent: abentley at panoramicfeedback.com-20060221210757-a2967f7c4589d51c
    parent: pqm at pqm.ubuntu.com-20060221211130-87707824495dc833
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Tue 2006-02-21 16:20:21 -0500
    message:
      Merge from mainline
    ------------------------------------------------------------
    merged: pqm at pqm.ubuntu.com-20060221211130-87707824495dc833
    parent: pqm at pqm.ubuntu.com-20060221174102-aa6bd4464296c614
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2006-02-21 21:11:30 +0000
    message:
      Added progress bars to tree-changing operations
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060221210757-a2967f7c4589d51c
    parent: abentley at panoramicfeedback.com-20060221152300-38559c3cdfe3370c
    parent: abentley at panoramicfeedback.com-20060221210653-861c4a970e0d3460
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Tue 2006-02-21 16:07:57 -0500
    message:
      Added progress bars to tree-changing operations
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060221210653-861c4a970e0d3460
    parent: abentley at panoramicfeedback.com-20060221175737-f161366f8426914a
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Tue 2006-02-21 16:06:53 -0500
    message:
      Fixed use of ui_factory (which can't be imported directly)
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060221175737-f161366f8426914a
    parent: abentley at panoramicfeedback.com-20060221174344-f3050cca65ef4a23
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Tue 2006-02-21 12:57:37 -0500
    message:
      Added progress bar to pull
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060221174344-f3050cca65ef4a23
    parent: abentley at panoramicfeedback.com-20060221173539-9b29d7f9991d08c3
    parent: pqm at pqm.ubuntu.com-20060221165139-95f219a192c54f27
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Tue 2006-02-21 12:43:44 -0500
    message:
      Merge from mainline
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060221173539-9b29d7f9991d08c3
    parent: abentley at panoramicfeedback.com-20060217161230-4cd4b3b76aa83a24
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Tue 2006-02-21 12:35:39 -0500
    message:
      Show progress bars in revert
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060217161230-4cd4b3b76aa83a24
    parent: abentley at panoramicfeedback.com-20060217145724-d283533cacf03e7c
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Fri 2006-02-17 11:12:30 -0500
    message:
      Disable merge progress bars, except from the merge command
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060217145724-d283533cacf03e7c
    parent: abentley at panoramicfeedback.com-20060217143929-ef39fc087bf80511
    parent: abentley at panoramicfeedback.com-20060217145536-47acd73ee3dad3b4
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Fri 2006-02-17 09:57:24 -0500
    message:
      Merged dangling inventory fix
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060217143929-ef39fc087bf80511
    parent: abentley at panoramicfeedback.com-20060217140221-60aef0b3d1998dc3
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Fri 2006-02-17 09:39:29 -0500
    message:
      Added progress bars to revert.
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060217140221-60aef0b3d1998dc3
    parent: abentley at panoramicfeedback.com-20060217134230-76d34bd5edfaa747
    parent: abentley at panoramicfeedback.com-20060217135725-1aa269dda84d7f46
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Fri 2006-02-17 09:02:21 -0500
    message:
      Merged Transform [Merged Robert [Merged John]]
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060217134230-76d34bd5edfaa747
    parent: abentley at panoramicfeedback.com-20060216185217-c766d147d91191d8
    parent: abentley at lappy-20060217125306-89e0b981e673e3c6
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Fri 2006-02-17 08:42:30 -0500
    message:
      Merged changes from transform
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060216185217-c766d147d91191d8
    parent: abentley at panoramicfeedback.com-20060216161825-6bad50573bfd84a2
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Transactional Tree Transforms
    timestamp: Thu 2006-02-16 13:52:17 -0500
    message:
      Added progress bars to merge