Rev 1662: Merge in faster joins from weave to knit. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1662
revision-id: pqm at pqm.ubuntu.com-20060427011433-95634ee1da8a2049
parent: pqm at pqm.ubuntu.com-20060426064544-35faa2d143c893a7
parent: robertc at robertcollins.net-20060427005942-9db2e52fe1170ebc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-04-27 02:14:33 +0100
message:
  Merge in faster joins from weave to knit.
modified:
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060427005942-9db2e52fe1170ebc
    parent: pqm at pqm.ubuntu.com-20060426064544-35faa2d143c893a7
    parent: robertc at robertcollins.net-20060426082109-4dcd5b716ac322a1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Thu 2006-04-27 10:59:42 +1000
    message:
      Merge in faster joins from weave to knit.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060426082109-4dcd5b716ac322a1
    parent: robertc at robertcollins.net-20060426052638-e95d815562fc6caa
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: faster-joins
    timestamp: Wed 2006-04-26 18:21:09 +1000
    message:
      Add a special cased weaves to knit converter.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060426052638-e95d815562fc6caa
    parent: robertc at robertcollins.net-20060424091132-5252fbb8a99e4c91
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: faster-joins
    timestamp: Wed 2006-04-26 15:26:38 +1000
    message:
      Factor out version_ids-to-join selection in InterVersionedfile.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060424091132-5252fbb8a99e4c91
    parent: pqm at pqm.ubuntu.com-20060424012027-0017c749480ad462
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: faster-joins
    timestamp: Mon 2006-04-24 19:11:32 +1000
    message:
      Fix versioned file joins with empty targets.