← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-31 12:22:44 UTC
  • mfrom: (1551.15.77 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070731122244-f1jemfecukeevugw
Clean up merge command, support arbitrary revisions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
27
27
    revision as _mod_revision,
28
28
    treebuilder,
29
29
    )
30
 
from bzrlib.builtins import _merge_helper
31
30
from bzrlib.bzrdir import BzrDir
32
31
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
33
32
from bzrlib.bundle.bundle_data import BundleTree
637
636
        self.assertEqualDiff(tree1_inv, tree2_inv)
638
637
        other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
639
638
        other.commit('rename file', rev_id='a@cset-0-6b')
640
 
        _merge_helper([other.basedir, -1], [None, None],
641
 
                      this_dir=self.tree1.basedir)
 
639
        self.tree1.merge_from_branch(other.branch)
642
640
        self.tree1.commit(u'Merge', rev_id='a@cset-0-7',
643
641
                          verbose=False)
644
642
        bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
740
738
        tt.create_file('file2', trans_id)
741
739
        tt.apply()
742
740
        other.commit('modify text in another tree', rev_id='a@lmod-0-2b')
743
 
        _merge_helper([other.basedir, -1], [None, None],
744
 
                      this_dir=self.tree1.basedir)
 
741
        self.tree1.merge_from_branch(other.branch)
745
742
        self.tree1.commit(u'Merge', rev_id='a@lmod-0-3',
746
743
                          verbose=False)
747
744
        self.tree1.commit(u'Merge', rev_id='a@lmod-0-4')