← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_3.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-26 08:05:45 UTC
  • mfrom: (5916 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5917.
  • Revision ID: john@arbash-meinel.com-20110526080545-5tprxfczyj4bfk0o
Merge bzr.dev 5916 and make sure the right patch is applied.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_3.py
72
72
        return [('trees', self.last_revision())]
73
73
 
74
74
    def unlock(self):
75
 
        # do non-implementation specific cleanup
76
 
        self._cleanup()
77
75
        if self._control_files._lock_count == 1:
 
76
           # do non-implementation specific cleanup
 
77
            self._cleanup()
78
78
            # _inventory_is_modified is always False during a read lock.
79
79
            if self._inventory_is_modified:
80
80
                self.flush()