/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/transform.py

  • Committer: Andrew Bennetts
  • Date: 2010-05-03 04:08:50 UTC
  • mfrom: (4797.43.8 2.1)
  • mto: This revision was merged to the branch mainline in revision 5199.
  • Revision ID: andrew.bennetts@canonical.com-20100503040850-wm4v7qx6wx3u7ns1
Merge lp:bzr/2.1 into lp:bzr, including fix for #528041.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1798
1798
            executable = self.is_executable(file_id, path)
1799
1799
        return kind, executable, None
1800
1800
 
1801
 
    def is_locked(self):
1802
 
        return False
1803
 
 
1804
1801
    def lock_read(self):
1805
1802
        # Perhaps in theory, this should lock the TreeTransform?
1806
 
        return self
 
1803
        pass
1807
1804
 
1808
1805
    def unlock(self):
1809
1806
        pass