← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Martin Pool
  • Date: 2011-06-14 01:43:10 UTC
  • mto: This revision was merged to the branch mainline in revision 6002.
  • Revision ID: mbp@canonical.com-20110614014310-g5ww9c5gieo2cg5k
test_fifo_cache shouldn't have a knownfailure for something that's impossible

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1462
1462
 
1463
1463
    missing_parent_conflicts = True
1464
1464
 
1465
 
    supports_versioned_directories = True
1466
 
 
1467
1465
    _lock_class = LockDir
1468
1466
    _lock_file_name = 'lock'
1469
1467
 
1715
1713
        annotations = self._repository.texts.annotate(text_key)
1716
1714
        return [(key[-1], line) for (key, line) in annotations]
1717
1715
 
 
1716
    def _get_ancestors(self, default_revision):
 
1717
        return set(self._repository.get_ancestry(self._revision_id,
 
1718
                                                 topo_sorted=False))
1718
1719
    def _comparison_data(self, entry, path):
1719
1720
        """See Tree._comparison_data."""
1720
1721
        if entry is None: