← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_merge_from_branch.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_merge_from_branch.py
20
20
import os
21
21
 
22
22
from bzrlib import (
23
 
    branchbuilder,
24
23
    errors,
25
24
    merge
26
25
    )
119
118
 
120
119
class TestMergedBranch(per_workingtree.TestCaseWithWorkingTree):
121
120
 
122
 
    def make_branch_builder(self, relpath, format=None):
123
 
        if format is None:
124
 
            format = self.bzrdir_format
125
 
        builder = branchbuilder.BranchBuilder(self.get_transport(),
126
 
                                              format=format)
127
 
        return builder
128
 
 
129
121
    def make_inner_branch(self):
130
122
        bld_inner = self.make_branch_builder('inner')
131
123
        bld_inner.start_series()