← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_repository.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-26 08:05:45 UTC
  • mfrom: (5916 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5917.
  • Revision ID: john@arbash-meinel.com-20110526080545-5tprxfczyj4bfk0o
Merge bzr.dev 5916 and make sure the right patch is applied.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_repository.py
1602
1602
        self.addCleanup(target.unlock)
1603
1603
        source = source_tree.branch.repository._get_source(target._format)
1604
1604
        self.orig_pack = target.pack
1605
 
        target.pack = self.log_pack
 
1605
        self.overrideAttr(target, "pack", self.log_pack)
1606
1606
        search = target.search_missing_revision_ids(
1607
1607
            source_tree.branch.repository, revision_ids=[tip])
1608
1608
        stream = source.get_stream(search)
1626
1626
        self.addCleanup(target.unlock)
1627
1627
        source = source_tree.branch.repository
1628
1628
        self.orig_pack = target.pack
1629
 
        target.pack = self.log_pack
 
1629
        self.overrideAttr(target, "pack", self.log_pack)
1630
1630
        target.fetch(source)
1631
1631
        if expect_pack_called:
1632
1632
            self.assertLength(1, self.calls)