/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/revision.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-04-01 06:48:38 UTC
  • mfrom: (2389.1.1 0.15-to-trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20070401064838-34903c7b0d0c8007
merge 0.15 back to dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revision.py
251
251
            pb.update('Picking ancestor', 1, 3)
252
252
            graph = revision_source.get_revision_graph_with_ghosts(
253
253
                [revision_a, revision_b])
254
 
            # Shortcut the case where one of the tips is already included in
255
 
            # the other graphs ancestry.
256
 
            ancestry_a = graph.get_ancestry(revision_a)
257
 
            if revision_b in ancestry_a:
258
 
                return revision_b
259
 
            ancestry_b = graph.get_ancestry(revision_b)
260
 
            if revision_a in ancestry_b:
261
 
                return revision_a
262
254
            # convert to a NULL_REVISION based graph.
263
255
            ancestors = graph.get_ancestors()
264
256
            descendants = graph.get_descendants()
265
 
            common = set(ancestry_a)
266
 
            common.intersection_update(ancestry_b)
 
257
            common = set(graph.get_ancestry(revision_a)).intersection(
 
258
                     set(graph.get_ancestry(revision_b)))
267
259
            descendants[NULL_REVISION] = {}
268
260
            ancestors[NULL_REVISION] = []
269
261
            for root in graph.roots: