Rev 2963: (robertc) Stage one of reconcile for pack repositories - perform inventory gc. (Robert Collins) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Sun Nov 4 22:47:38 GMT 2007


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2963
revision-id: pqm at pqm.ubuntu.com-20071104224734-8l8km2gqk9n1pdla
parent: pqm at pqm.ubuntu.com-20071104185139-kaio3sneodg2kp71
parent: robertc at robertcollins.net-20071104215830-ezhmccg0a750kb0l
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-11-04 22:47:34 +0000
message:
  (robertc) Stage one of reconcile for pack repositories - perform inventory gc. (Robert Collins)
modified:
  bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
  bzrlib/tests/repository_implementations/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
  bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
  bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
    ------------------------------------------------------------
    revno: 2951.1.11
    merged: robertc at robertcollins.net-20071104215830-ezhmccg0a750kb0l
    parent: robertc at robertcollins.net-20071104203532-6vndyb5pv82em6n7
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2007-11-05 08:58:30 +1100
    message:
      Do not try to use try:finally: around a yield for python 2.4.
    ------------------------------------------------------------
    revno: 2951.1.10
    merged: robertc at robertcollins.net-20071104203532-6vndyb5pv82em6n7
    parent: robertc at robertcollins.net-20071104195306-36xbgtsvvrtr5jkz
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Mon 2007-11-05 07:35:32 +1100
    message:
      Peer review feedback with Ian.
    ------------------------------------------------------------
    revno: 2951.1.9
    merged: robertc at robertcollins.net-20071104195306-36xbgtsvvrtr5jkz
    parent: robertc at robertcollins.net-20071104153255-00xlkcuu9cl6gqzn
    parent: pqm at pqm.ubuntu.com-20071104185139-kaio3sneodg2kp71
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Mon 2007-11-05 06:53:06 +1100
    message:
      Latest bzr.dev.
    ------------------------------------------------------------
    revno: 2951.1.8
    merged: robertc at robertcollins.net-20071104153255-00xlkcuu9cl6gqzn
    parent: robertc at robertcollins.net-20071103183255-3h06a3ijbennz6w1
    parent: pqm at pqm.ubuntu.com-20071104041002-f0vk33xqo463lnt6
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Mon 2007-11-05 02:32:55 +1100
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    revno: 2951.1.7
    merged: robertc at robertcollins.net-20071103183255-3h06a3ijbennz6w1
    parent: robertc at robertcollins.net-20071103142637-1diuxsp2at93vcon
    parent: pqm at pqm.ubuntu.com-20071103093911-4alf7wiad3n3vfz6
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Sun 2007-11-04 05:32:55 +1100
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    revno: 2951.1.6
    merged: robertc at robertcollins.net-20071103142637-1diuxsp2at93vcon
    parent: robertc at robertcollins.net-20071103134754-l5lspakbc6pssydf
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Sun 2007-11-04 01:26:37 +1100
    message:
      All check/reconcile tests passing now.
    ------------------------------------------------------------
    revno: 2951.1.5
    merged: robertc at robertcollins.net-20071103134754-l5lspakbc6pssydf
    parent: robertc at robertcollins.net-20071031232803-igxkczmug4hpmvq4
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Sun 2007-11-04 00:47:54 +1100
    message:
      Some work towards including the correct changes for TREE_ROOT in check parameterised tests.
    ------------------------------------------------------------
    revno: 2951.1.4
    merged: robertc at robertcollins.net-20071031232803-igxkczmug4hpmvq4
    parent: robertc at robertcollins.net-20071031223353-rwxukxnvocam1jlb
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Thu 2007-11-01 10:28:03 +1100
    message:
      Lock correctness for check/reconcile tests.
    ------------------------------------------------------------
    revno: 2951.1.3
    merged: robertc at robertcollins.net-20071031223353-rwxukxnvocam1jlb
    parent: robertc at robertcollins.net-20071031205323-pbtan7ltoci9slpq
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Thu 2007-11-01 09:33:53 +1100
    message:
      Partial support for native reconcile with packs.
    ------------------------------------------------------------
    revno: 2951.1.2
    merged: robertc at robertcollins.net-20071031205323-pbtan7ltoci9slpq
    parent: robertc at robertcollins.net-20071031165438-lc0o11v5vaf3p1ta
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Thu 2007-11-01 07:53:23 +1100
    message:
      Partial refactoring of pack_repo to create a Packer object for packing.

Diff too large for email (1274 lines, the limit is 1000).



More information about the bazaar-commits mailing list