← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Aaron Bentley
  • Date: 2007-04-10 16:32:32 UTC
  • mto: (2520.4.1 bzr.mpbundle) (0.9.13 temp)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070410163232-y2w6ke39sxb305yv
Get three-parent comparisions under test

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
1
1
from difflib import SequenceMatcher
2
2
 
 
3
 
3
4
class MultiParent(object):
4
5
 
5
6
    def __init__(self, hunks=None):
33
34
                return None
34
35
        cur_block = [next_block(p) for p, i in enumerate(block_iter)]
35
36
        while cur_line < len(text):
36
 
            #import pdb; pdb.set_trace()
37
37
            best_match = None
38
38
            for p, block in enumerate(cur_block):
39
39
                if block is None: