← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Robert Collins
  • Date: 2006-02-28 08:27:59 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060228082759-d082181cb6fa27e5
First cut at including the knit implementation of versioned_file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
54
54
 
55
55
        Must raise RevisionNotPresent if any of the given parents are
56
56
        not present in file history."""
57
 
        raise NotImplementedError(self.add_text)
 
57
        raise NotImplementedError(self.add_lines)
58
58
 
59
59
    def clone_text(self, new_version_id, old_version_id, parents,
60
60
                   transaction):
121
121
    def annotate(self, version_id):
122
122
        return list(self.annotate_iter(version_id))
123
123
 
124
 
    def join(self, other, version_ids, transaction, pb=None):
 
124
    def join(self, other, pb=None, msg=None, version_ids=None):
125
125
        """Integrate versions from other into this versioned file.
126
126
 
127
127
        If version_ids is None all versions from other should be