~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

[patch] Aaron Bentley: blackbox test and fix for 'bzr find-merge-base'

Show diffs side-by-side

added added

removed removed

Lines of Context:
1523
1523
        last1 = branch1.last_revision()
1524
1524
        last2 = branch2.last_revision()
1525
1525
 
1526
 
        source = MultipleRevisionSources(branch1, branch2)
 
1526
        source = MultipleRevisionSources(branch1.repository, 
 
1527
                                         branch2.repository)
1527
1528
        
1528
1529
        base_rev_id = common_ancestor(last1, last2, source)
1529
1530