← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-03 11:26:53 UTC
  • mfrom: (4245.2.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090403112653-xcbrm6c5zdlymd53
(ianc) test tweaks & _reconcile_pack from brisbane-core (Robert
        Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
505
505
            total_inventories = len(list(
506
506
                collection.inventory_index.combined_index.iter_all_entries()))
507
507
            if len(all_revisions):
508
 
                self._packer = repofmt.pack_repo.ReconcilePacker(
509
 
                    collection, packs, ".reconcile", all_revisions)
510
 
                new_pack = self._packer.pack(pb=self.pb)
 
508
                new_pack =  self.repo._reconcile_pack(collection, packs,
 
509
                    ".reconcile", all_revisions, self.pb)
511
510
                if new_pack is not None:
512
511
                    self._discard_and_save(packs)
513
512
            else: