/brz/remove-bazaar : revision 1534.7.155

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

Viewing changes to bzrlib/builtins.py

Committer: Aaron Bentley
Date: 2006-02-13 00:24:36 UTC
mto: (1558.1.4 Aaron's integration) (1534.9.2 Transactional Tree Transforms) (1185.50.82 bzr-jam-integration) (2027.1.2 revert-subpath-56549)
mto: This revision was merged to the branch mainline in revision 1558.
Revision ID: aaron.bentley@utoronto.ca-20060213002436-ca1e5b680fb005cd

Removed changes from bzr.ab 1526..1528

added added

removed removed

1556

last1 = branch1.last_revision()

1557

last2 = branch2.last_revision()

1558

1559

source = MultipleRevisionSources(branch1.repository,

1560

branch2.repository)

1559

source = MultipleRevisionSources(branch1, branch2)

1561

1560

1562

1561

base_rev_id = common_ancestor(last1, last2, source)

1563

1562