← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Martin Pool
  • Date: 2005-10-05 03:02:11 UTC
  • mto: (1185.13.3)
  • mto: This revision was merged to the branch mainline in revision 1403.
  • Revision ID: mbp@sourcefrog.net-20051005030211-e2b47edabbbddd34
- Weave._delta is not implemented at the moment

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
614
614
        If there is a chunk of the file where there's no diagreement,
615
615
        only one alternative is given.
616
616
        """
617
 
 
618
617
        # approach: find the included versions common to all the
619
618
        # merged versions
620
619
        raise NotImplementedError()
640
639
        If line1=line2, this is a pure insert; if newlines=[] this is a
641
640
        pure delete.  (Similar to difflib.)
642
641
        """
643
 
 
 
642
        raise NotImplementedError()
644
643
 
645
644
            
646
645
    def plan_merge(self, ver_a, ver_b):