← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/memorytree.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-07 10:36:24 UTC
  • mfrom: (5764 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5766.
  • Revision ID: john@arbash-meinel.com-20110407103624-n76g6tjeqmznwdcd
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/memorytree.py
49
49
        self._locks = 0
50
50
        self._lock_mode = None
51
51
 
 
52
    def is_control_filename(self, filename):
 
53
        # Memory tree doesn't have any control filenames
 
54
        return False
 
55
 
52
56
    @needs_tree_write_lock
53
57
    def _add(self, files, ids, kinds):
54
58
        """See MutableTree._add."""