← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-24 10:10:59 UTC
  • mfrom: (6405 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6407.
  • Revision ID: jelmer@samba.org-20111224101059-epghsc5y61hsgbl2
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/controldir.py
842
842
 
843
843
 
844
844
class ControlComponentFormat(object):
845
 
    """A component that can live inside of a .bzr meta directory."""
 
845
    """A component that can live inside of a control directory."""
846
846
 
847
847
    upgrade_recommended = False
848
848