Rev 1406: All pending merges operations from Branch are now on WorkingTree. in /home/robertc/source/baz/integration

------------------------------------------------------------
revno: 1406
revision-id: robertc at robertcollins.net-20051106001204-b8c6d5169308d7e6
parent: robertc at robertcollins.net-20051104232747-5872c68d759bc7be
parent: robertc at robertcollins.net-20051105232539-7ecddc1d5c8f66fe
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-11-05 19:12:04 -0500
message:
  All pending merges operations from Branch are now on WorkingTree.
  (Robert Collins)
  
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  build-api                      build-api-20050309064830-a0be0dc1452cda87
  bzrlib/add.py                  add.py-20050323030017-3a77d63feda58e33
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/clone.py                clone.py-20050929121333-bc726d1ddd8042bc
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/hashcache.py            hashcache.py-20050706091756-fe3a8cc1143ff24f
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/selftest/blackbox.py    blackbox.py-20050620052131-a7370d756399f615
  bzrlib/selftest/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
  bzrlib/selftest/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/selftest/testbranch.py  testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/selftest/testinv.py     testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/selftest/testmerge.py   testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/selftest/testrevision.py testrevision.py-20050804210559-46f5e1eb67b01289
  bzrlib/selftest/teststatus.py  teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/selftest/testworkingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051105232539-7ecddc1d5c8f66fe
    parent: robertc at robertcollins.net-20051105231911-daec2c32fe7ca454
    committer: Robert Collins <robertc at robertcollins.net>
    timestamp: Sat 2005-11-05 18:25:39 -0500
    message:
      Move set_pending_merges to WorkingTree.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051105231911-daec2c32fe7ca454
    parent: robertc at robertcollins.net-20051105230107-63b2bb28dd1f6199
    committer: Robert Collins <robertc at robertcollins.net>
    timestamp: Sat 2005-11-05 18:19:11 -0500
    message:
      Move add_pending_merge to WorkingTree.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051105230107-63b2bb28dd1f6199
    parent: robertc at robertcollins.net-20051105222406-40c8684ad68d97dc
    committer: Robert Collins <robertc at robertcollins.net>
    timestamp: Sat 2005-11-05 18:01:07 -0500
    message:
      Move pending_merges() to WorkingTree.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051105222406-40c8684ad68d97dc
    parent: robertc at robertcollins.net-20051105221812-a2a774e6f8d993be
    committer: Robert Collins <robertc at robertcollins.net>
    timestamp: Sat 2005-11-05 17:24:06 -0500
    message:
      whitespace
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051105221812-a2a774e6f8d993be
    parent: robertc at robertcollins.net-20051105155019-a343c6aff1a8eaa0
    committer: Robert Collins <robertc at robertcollins.net>
    timestamp: Sat 2005-11-05 17:18:12 -0500
    message:
      Update comment to reflect author.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051105155019-a343c6aff1a8eaa0
    parent: robertc at robertcollins.net-20051105152357-2b072e3f033d6596
    committer: Robert Collins <robertc at robertcollins.net>
    timestamp: Sat 2005-11-05 10:50:19 -0500
    message:
      Move _write_inventory to WorkingTree.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051105152357-2b072e3f033d6596
    parent: robertc at robertcollins.net-20051105150939-642e7e572c1e9ddb
    committer: Robert Collins <robertc at robertcollins.net>
    timestamp: Sat 2005-11-05 10:23:57 -0500
    message:
      Move set_root_id to WorkingTree.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051105150939-642e7e572c1e9ddb
    parent: robertc at robertcollins.net-20051105144839-0778253797be08ec
    committer: Robert Collins <robertc at robertcollins.net>
    timestamp: Sat 2005-11-05 10:09:39 -0500
    message:
      Change cmd_revert implementation to call workingtree.Revert.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051105144839-0778253797be08ec
    parent: robertc at robertcollins.net-20051104165442-a49126bfb45faea7
    committer: Robert Collins <robertc at robertcollins.net>
    timestamp: Sat 2005-11-05 09:48:39 -0500
    message:
      Replace the WorkingTree.revert method algorithm with a call to merge_inner.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051104165442-a49126bfb45faea7
    parent: robertc at robertcollins.net-20051104165404-61dfbc093c768448
    committer: Robert Collins <robertc at robertcollins.net>
    timestamp: Fri 2005-11-04 11:54:42 -0500
    message:
      Change cmd_revert to use merge_inner.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051104165404-61dfbc093c768448
    parent: robertc at robertcollins.net-20051021040258-84a5db1be67b30b9
    parent: robertc at robertcollins.net-20051104150539-c99884403b7b9e3f
    committer: Robert Collins <robertc at robertcollins.net>
    timestamp: Fri 2005-11-04 11:54:04 -0500
    message:
      Merge from integration.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051021040258-84a5db1be67b30b9
    parent: robertc at lifelesslap.robertcollins.net-20051016223125-26d4401cb94b7b82
    committer: Robert Collins <robertc at robertcollins.net>
    timestamp: Fri 2005-10-21 14:02:58 +1000
    message:
      make build-api have a hasbang