← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

(robertc) Deprecate WorkingTree.pending_merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
234
234
        """
235
235
        br1, br2 = make_branches(self)
236
236
        source = MultipleRevisionSources(br1.repository, br2.repository)
237
 
        combined_1 = combined_graph(br1.last_revision(), 
 
237
        combined_1 = combined_graph(br1.last_revision(),
238
238
                                    br2.last_revision(), source)
239
239
        combined_2 = combined_graph(br2.last_revision(),
240
240
                                    br1.last_revision(), source)