Rev 1603: Merge in merge_sort facility. in /home/pqm/archives/thelove/bzr/+trunk/

Wed Mar 29 08:59:57 BST 2006

------------------------------------------------------------
revno: 1603
revision-id: pqm at pqm.ubuntu.com-20060329075955-de865fe54faae442
parent: pqm at pqm.ubuntu.com-20060328190455-9eab3a4045b61c4a
parent: robertc at robertcollins.net-20060328152252-c828fe03375b12e4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-29 08:59:55 +0100
message:
  Merge in merge_sort facility.
modified:
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/test_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
  bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060328152252-c828fe03375b12e4
    parent: pqm at pqm.ubuntu.com-20060328113546-b4c98b0015b7f681
    parent: robertc at robertcollins.net-20060328142913-ac5afb37075719c6
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2006-03-29 02:22:52 +1100
    message:
      Merge in merge_sort facility.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060328142913-ac5afb37075719c6
    parent: robertc at robertcollins.net-20060328111628-47766b0fdfa443ab
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: logsort
    timestamp: Wed 2006-03-29 01:29:13 +1100
    message:
      Convert log to use the new tsort.merge_sort routine.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060328111628-47766b0fdfa443ab
    parent: robertc at robertcollins.net-20060327070904-df062ddc4cf415ad
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: logsort
    timestamp: Tue 2006-03-28 22:16:28 +1100
    message:
      Add MergeSort facility to bzrlib.tsort.