← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-30 14:30:10 UTC
  • mfrom: (6615.3.7 merges)
  • mto: This revision was merged to the branch mainline in revision 6621.
  • Revision ID: v.ladeuil+lp@free.fr-20170130143010-p31t1ranfeqbaeki
Merge  2.7 into trunk including fix for bug #1657238

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
51
51
        self._locks = 0
52
52
        self._lock_mode = None
53
53
 
 
54
    def get_config_stack(self):
 
55
        return self.branch.get_config_stack()
 
56
 
54
57
    def is_control_filename(self, filename):
55
58
        # Memory tree doesn't have any control filenames
56
59
        return False