~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to graph.py

  • Committer: Aaron Bentley
  • Date: 2009-03-11 06:44:59 UTC
  • Revision ID: aaron@aaronbentley.com-20090311064459-mez7p4g64e2xz7x9
Implement conflict-diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
 
21
21
from bzrlib.branch import Branch
22
22
from bzrlib.errors import BzrCommandError, NoSuchRevision
23
 
from bzrlib.graph import node_distances, select_farthest
 
23
from bzrlib.deprecated_graph import node_distances, select_farthest
24
24
from bzrlib.revision import NULL_REVISION
25
25
 
26
26
from bzrtools import short_committer