← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revision.py

  • Committer: Aaron Bentley
  • Date: 2005-09-10 19:45:35 UTC
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050910194534-84c8aa9632281cac
Fixed graph-generation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revision.py
283
283
                descendants[parent][line] = 1
284
284
            ancestors[line] = set(parents)
285
285
        lines = new_lines
 
286
    assert root not in descendants[root]
 
287
    assert root not in ancestors[root]
286
288
    return root, ancestors, descendants
287
289
 
288
290
def combined_graph(revision_a, revision_b, revision_source):
300
302
    for node, node_dec in descendants_b.iteritems():
301
303
        if node not in descendants:
302
304
            descendants[node] = set()
303
 
        descendants[node].update(descendants)
 
305
        descendants[node].update(node_dec)
304
306
    return root, ancestors, descendants, common
305
307
 
306
308
def common_ancestor(revision_a, revision_b, revision_source):