← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.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/mutabletree.py
83
83
        """True if filename is the name of a control file in this tree.
84
84
 
85
85
        :param filename: A filename within the tree. This is a relative path
86
 
        from the root of this tree.
 
86
            from the root of this tree.
87
87
 
88
88
        This is true IF and ONLY IF the filename is part of the meta data
89
89
        that bzr controls in this tree. I.E. a random .bzr directory placed