← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revisiontree.py

Work in progress to make merge_inner work with dirstate trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revisiontree.py
97
97
        ie = self._inventory[file_id]
98
98
        if ie.kind != "file":
99
99
            return None 
100
 
        return self._inventory[file_id].executable
 
100
        return ie.executable
101
101
 
102
102
    def has_filename(self, filename):
103
103
        return bool(self.inventory.path2id(filename))