/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

  • Committer: Aaron Bentley
  • Date: 2007-08-15 16:05:13 UTC
  • mfrom: (2703 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2709.
  • Revision ID: abentley@panoramicfeedback.com-20070815160513-aepyrd0uu9vtedsy
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
449
449
        """Please use Weave.clone_text now."""
450
450
        return self.clone_text(new_rev_id, old_rev_id, parents)
451
451
 
452
 
    def _add_lines(self, version_id, parents, lines, parent_texts):
 
452
    def _add_lines(self, version_id, parents, lines, parent_texts,
 
453
                   left_matching_blocks=None):
453
454
        """See VersionedFile.add_lines."""
454
455
        return self._add(version_id, lines, map(self._lookup, parents))
455
456
 
1109
1110
            # new file, save it
1110
1111
            self._save()
1111
1112
 
1112
 
    def _add_lines(self, version_id, parents, lines, parent_texts):
 
1113
    def _add_lines(self, version_id, parents, lines, parent_texts,
 
1114
        left_matching_blocks=None):
1113
1115
        """Add a version and save the weave."""
1114
1116
        self.check_not_reserved_id(version_id)
1115
1117
        result = super(WeaveFile, self)._add_lines(version_id, parents, lines,