← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_log.py

  • Committer: Marius Kruger
  • Date: 2009-05-16 01:02:05 UTC
  • mto: (4379.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4380.
  • Revision ID: amanic@gmail.com-20090516010205-0jlizxz3it6j7xxa
use make_linear_branch in make_merged_branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
54
54
        return tree
55
55
 
56
56
    def make_merged_branch(self, path='.', format=None):
57
 
        tree = self.make_branch_and_tree(path, format=format)
58
 
        self.build_tree(
59
 
            [path + '/hello.txt', path + '/goodbye.txt', path + '/meep.txt'])
60
 
        tree.add('hello.txt')
61
 
        revision_id1 = tree.commit(message='message1')
62
 
        tree.add('goodbye.txt')
63
 
        tree.commit(message='message2')
64
 
        tree.add('meep.txt')
65
 
        tree.commit(message='message3')
66
 
 
67
 
        tree2 = tree.bzrdir.sprout('tree2', revision_id=revision_id1
68
 
            ).open_workingtree()
 
57
        tree = self.make_linear_branch(path, format)
 
58
        tree2 = tree.bzrdir.sprout('tree2',
 
59
            revision_id=tree.branch.get_rev_id(1)).open_workingtree()
69
60
        tree2.commit(message='tree2 message2')
70
61
        tree2.commit(message='tree2 message3')
71
62
        tree.merge_from_branch(tree2.branch)