/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Aaron Bentley
  • Date: 2006-09-26 13:28:39 UTC
  • mto: This revision was merged to the branch mainline in revision 2048.
  • Revision ID: abentley@panoramicfeedback.com-20060926132839-cee32159ab268eeb
Changes from review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
19
19
import sys
20
20
import tempfile
21
21
 
22
 
from bzrlib import bzrdir, errors, inventory, repository, treebuilder
 
22
from bzrlib import (
 
23
    bzrdir, 
 
24
    errors, 
 
25
    inventory, 
 
26
    repository, 
 
27
    treebuilder,
 
28
    )
23
29
from bzrlib.builtins import merge
24
30
from bzrlib.bzrdir import BzrDir
25
31
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
449
455
                os.mkdir(checkout_dir)
450
456
        tree = self.make_branch_and_tree(checkout_dir)
451
457
        s = StringIO()
452
 
        ancestors = write_bundle(self.b1.repository, rev_id, None, s, 
 
458
        ancestors = write_bundle(self.b1.repository, rev_id, None, s,
453
459
                                 format=self.format)
454
460
        s.seek(0)
455
461
        assert isinstance(s.getvalue(), str), (