~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/builtins.py

Committer: Aaron Bentley
Date: 2006-02-13 19:19:49 UTC
mto: (1185.50.74 bzr-jam-integration) (1551.19.24 Aaron's mergeable stuff) (1731.2.9 nested-trees) (2234.6.1 bzr.0.14) (2229.2.4 reserved-ids) (2323.6.9 0.15-integration) (1558.4.5 Aaron's integration)
mto: This revision was merged to the branch mainline in revision 1554.
Revision ID: abentley@panoramicfeedback.com-20060213191949-bd6946ac59e19a25

Fix find-merge-base for new API [recommit]

added added

removed removed

1523

last1 = branch1.last_revision()

1524

last2 = branch2.last_revision()

1525

1526

source = MultipleRevisionSources(branch1, branch2)

1526

source = MultipleRevisionSources(branch1.repository,

1527

branch2.repository)

1527

1528

1529

base_rev_id = common_ancestor(last1, last2, source)

1529

1530