← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-11-11 08:45:19 UTC
  • mfrom: (4597.9.22 reports-conflict-resolved)
  • Revision ID: pqm@pqm.ubuntu.com-20101111084519-bmk1zmblp7kex41a
(vila) More feedback about the conflicts just resolved and the remaining
 ones. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1867
1867
    def is_executable(self, file_id, path=None):
1868
1868
        ie = self.inventory[file_id]
1869
1869
        if ie.kind != "file":
1870
 
            return False
 
1870
            return None
1871
1871
        return ie.executable
1872
1872
 
1873
1873
    def is_locked(self):