← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

Merge bzr.dev into cleanup resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
68
68
    index as _mod_index,
69
69
    lru_cache,
70
70
    pack,
 
71
    patiencediff,
71
72
    progress,
72
73
    static_tuple,
73
74
    trace,
79
80
from bzrlib import (
80
81
    errors,
81
82
    osutils,
82
 
    patiencediff,
83
83
    )
84
84
from bzrlib.errors import (
85
85
    FileExists,
3417
3417
            raise exc_class, exc_value, exc_traceback
3418
3418
 
3419
3419
 
3420
 
# Deprecated, use PatienceSequenceMatcher instead
3421
 
KnitSequenceMatcher = patiencediff.PatienceSequenceMatcher
3422
 
 
3423
 
 
3424
3420
def annotate_knit(knit, revision_id):
3425
3421
    """Annotate a knit with no cached annotations.
3426
3422