/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
176
176
        self._name_map = {}
177
177
        self._weave_name = weave_name
178
178
 
 
179
    def __repr__(self):
 
180
        return "Weave(%r)" % self._weave_name
 
181
 
179
182
 
180
183
    def copy(self):
181
184
        """Return a deep copy of self.
618
621
        # properly paired, etc.
619
622
 
620
623
 
621
 
 
622
 
    def merge(self, merge_versions):
623
 
        """Automerge and mark conflicts between versions.
624
 
 
625
 
        This returns a sequence, each entry describing alternatives
626
 
        for a chunk of the file.  Each of the alternatives is given as
627
 
        a list of lines.
628
 
 
629
 
        If there is a chunk of the file where there's no diagreement,
630
 
        only one alternative is given.
631
 
        """
632
 
        # approach: find the included versions common to all the
633
 
        # merged versions
634
 
        raise NotImplementedError()
635
 
 
636
 
 
637
 
 
638
624
    def _delta(self, included, lines):
639
625
        """Return changes from basis to new revision.
640
626