/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 bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2005-10-13 17:03:20 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1460.
  • Revision ID: abentley@panoramicfeedback.com-20051013170320-731d9d3efaeb81d6
Removed use of readonly path for executability test

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
376
376
        else:
377
377
            return None
378
378
 
 
379
    def kind(self, file_id):
 
380
        return file_kind(self.id2abspath(file_id))
 
381
 
379
382
CONFLICT_SUFFIXES = ('.THIS', '.BASE', '.OTHER')
380
383
def get_conflicted_stem(path):
381
384
    for suffix in CONFLICT_SUFFIXES: