← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

  • Committer: Martin
  • Date: 2011-05-21 16:29:38 UTC
  • mto: This revision was merged to the branch mainline in revision 5907.
  • Revision ID: gzlist@googlemail.com-20110521162938-1vrw3hp0197l3vrl
Add tests for non-ascii conflict serialisation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisiontree.py
179
179
    def _file_size(self, entry, stat_value):
180
180
        return entry.text_size
181
181
 
 
182
    def _get_ancestors(self, default_revision):
 
183
        return set(self._repository.get_ancestry(self._revision_id,
 
184
                                                 topo_sorted=False))
 
185
 
182
186
    def walkdirs(self, prefix=""):
183
187
        _directory = 'directory'
184
188
        inv = self.inventory