/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: John Arbash Meinel
  • Date: 2006-09-12 20:46:42 UTC
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20060912204642-91599869cc863f07
Cleanup, deprecated, and get the tests passing again.

bzrlib.builtins.merge is heavily used by the test suite, though it is
really the wrong place for a function like that.
lazy imports work badly with doctests, but so far none of the doc tested
modules had anything worth testing in that fashion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
20
20
import tempfile
21
21
 
22
22
from bzrlib import inventory
23
 
from bzrlib.builtins import merge
 
23
from bzrlib.builtins import _merge_helper
24
24
from bzrlib.bzrdir import BzrDir
25
25
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
26
26
from bzrlib.bundle.bundle_data import BundleTree
573
573
        other = self.get_checkout('a@cset-0-5')
574
574
        other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
575
575
        other.commit('rename file', rev_id='a@cset-0-6b')
576
 
        merge([other.basedir, -1], [None, None], this_dir=self.tree1.basedir)
 
576
        _merge_helper([other.basedir, -1], [None, None],
 
577
                      this_dir=self.tree1.basedir)
577
578
        self.tree1.commit(u'Merge', rev_id='a@cset-0-7',
578
579
                          verbose=False)
579
580
        bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
674
675
        tt.create_file('file2', trans_id)
675
676
        tt.apply()
676
677
        other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
677
 
        merge([other.basedir, -1], [None, None], this_dir=self.tree1.basedir)
 
678
        _merge_helper([other.basedir, -1], [None, None],
 
679
                      this_dir=self.tree1.basedir)
678
680
        self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
679
681
                          verbose=False)
680
682
        self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')