/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 breezy/tests/per_intertree/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2018-02-18 15:49:32 UTC
  • mfrom: (6857 trunk)
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180218154932-q0ihqx714ms38j2u
Merge trink.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_intertree/__init__.py
62
62
            raise tests.TestNotApplicable('cannot represent unversioned files')
63
63
 
64
64
    def not_applicable_if_missing_in(self, relpath, tree):
65
 
        if not tree.path2id(relpath):
 
65
        if not tree.is_versioned(relpath):
66
66
            # The locked test trees conversion could not preserve the missing
67
67
            # file status. This is normal (e.g. InterDirstateTree falls back
68
68
            # to InterTree if the basis is not a DirstateRevisionTree, and