← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
58
58
    trees or versioned trees.
59
59
    """
60
60
 
 
61
    def has_versioned_directories(self):
 
62
        """Whether this tree can contain explicitly versioned directories.
 
63
 
 
64
        This defaults to True, but some implementations may want to override
 
65
        it.
 
66
        """
 
67
        return True
 
68
 
61
69
    def changes_from(self, other, want_unchanged=False, specific_files=None,
62
70
        extra_trees=None, require_versioned=False, include_root=False,
63
71
        want_unversioned=False):