← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge cleanup into first-try

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
527
527
 
528
528
        # Now we have the parents of this content
529
529
        annotator = self.branch.repository.texts.get_annotator()
530
 
        text = self.get_file(file_id).read()
 
530
        text = self.get_file_text(file_id)
531
531
        this_key =(file_id, default_revision)
532
532
        annotator.add_special_text(this_key, file_parent_keys, text)
533
533
        annotations = [(key[-1], line)