← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: John Arbash Meinel
  • Date: 2005-11-10 03:59:26 UTC
  • mto: This revision was merged to the branch mainline in revision 1727.
  • Revision ID: john@arbash-meinel.com-20051110035926-e391fd93199f0537
Added some more test cases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
68
68
 
69
69
 
70
70
import sha
71
 
from bzrlib.cdv.difflib import unified_diff
72
 
from bzrlib.cdv.difflib import SequenceMatcher
 
71
# from difflib import unified_diff
 
72
from bzrlib.cdv.cdvdifflib import unified_diff
 
73
from bzrlib.cdv.cdvdifflib import SequenceMatcher
73
74
 
74
75
from bzrlib.trace import mutter
75
76
from bzrlib.errors import WeaveError, WeaveFormatError, WeaveParentMismatch, \