Rev 1971: (robertc) Alter the pending-merges api so that when the last-revision of a tree is None, the left most pending merge becomes the last-revision. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1971
revision-id: pqm at pqm.ubuntu.com-20060830025036-8fdc36a32ac66f72
parent: pqm at pqm.ubuntu.com-20060829203613-7e3625a2434c3a19
parent: robertc at robertcollins.net-20060828064218-09fa4d6e18ff16b2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-08-30 03:50:36 +0100
message:
  (robertc) Alter the pending-merges api so that when the last-revision of a tree is None, the left most pending merge becomes the last-revision.
modified:
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
  bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
  bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
  bzrlib/tests/workingtree_implementations/test_get_parent_ids.py test_get_parent_ids.py-20060616123734-jq0zc755ud2u644s-1
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060828064218-09fa4d6e18ff16b2
    parent: robertc at robertcollins.net-20060825065550-f931cab451d7dec5
    parent: robertc at robertcollins.net-20060828063809-ec08039f434fa3bb
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: pending-merges-handles-last-revision-None
    timestamp: Mon 2006-08-28 16:42:18 +1000
    message:
      Merge bzr.dev.
        ------------------------------------------------------------
        merged: robertc at robertcollins.net-20060828063809-ec08039f434fa3bb
        parent: robertc at robertcollins.net-20060825065050-026266d73d14e967
        parent: pqm at pqm.ubuntu.com-20060828012417-06e65a27028c9476
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: misc fixen
        timestamp: Mon 2006-08-28 16:38:09 +1000
        message:
          Merge bzr.dev.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060825065550-f931cab451d7dec5
    parent: robertc at robertcollins.net-20060822054035-74eaacca85abbf26
    parent: robertc at robertcollins.net-20060825065050-026266d73d14e967
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: pending-merges-handles-last-revision-None
    timestamp: Fri 2006-08-25 16:55:50 +1000
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060822054035-74eaacca85abbf26
    parent: robertc at robertcollins.net-20060822044825-19bdda1ac69a1008
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: pending-merges-handles-last-revision-None
    timestamp: Tue 2006-08-22 15:40:35 +1000
    message:
      review comment application - paired with Martin.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060822044825-19bdda1ac69a1008
    parent: robertc at robertcollins.net-20060817033526-d36c591bf3d93152
    parent: pqm at pqm.ubuntu.com-20060818230844-138315adab4cfe22
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: pending-merges-handles-last-revision-None
    timestamp: Tue 2006-08-22 14:48:25 +1000
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060817033526-d36c591bf3d93152
    parent: pqm at pqm.ubuntu.com-20060815155756-77559a6254704822
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: pending-merges-handles-last-revision-None
    timestamp: Thu 2006-08-17 13:35:26 +1000
    message:
      Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.