← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: Martin Pool
  • Date: 2007-08-20 05:48:40 UTC
  • mfrom: (2727 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2737.
  • Revision ID: mbp@sourcefrog.net-20070820054840-x2ugmd9dc4yodw9o
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
39
39
        r'bzrlib\.tests\.test_revision')
40
40
 
41
41
# XXX: Make this a method of a merge base case
42
 
def make_branches(self):
 
42
def make_branches(self, format=None):
43
43
    """Create two branches
44
44
 
45
45
    branch 1 has 6 commits, branch 2 has 3 commits
58
58
    so A is missing b6 at the start
59
59
    and B is missing a3, a4, a5
60
60
    """
61
 
    tree1 = self.make_branch_and_tree("branch1")
 
61
    tree1 = self.make_branch_and_tree("branch1", format=format)
62
62
    br1 = tree1.branch
63
63
    
64
64
    tree1.commit("Commit one", rev_id="a@u-0-0")