← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_3.py

  • Committer: Martin
  • Date: 2011-05-21 16:29:38 UTC
  • mto: This revision was merged to the branch mainline in revision 5907.
  • Revision ID: gzlist@googlemail.com-20110521162938-1vrw3hp0197l3vrl
Add tests for non-ascii conflict serialisation

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()
75
77
        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()
102
102
 
103
103
    missing_parent_conflicts = True
104
104
 
105
 
    supports_versioned_directories = True
106
 
 
107
105
    def get_format_string(self):
108
106
        """See WorkingTreeFormat.get_format_string()."""
109
107
        return "Bazaar-NG Working Tree format 3"