← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-02-13 22:05:25 UTC
  • mfrom: (4005.1.3 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090213220525-f4o6y76g5mjtxb7k
Merge 1.12 final back into bzr.dev (and the 1.11 tip revision)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
3136
3136
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
3137
3137
    help='A working-tree format that supports views and content filtering.',
3138
3138
    branch_format='bzrlib.branch.BzrBranchFormat7',
3139
 
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
 
3139
    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
3140
3140
    experimental=True,
3141
3141
    )
3142
3142
format_registry.register_metadir('development-wt5-rich-root',
3144
3144
    help='A variant of development-wt5 that supports rich-root data '
3145
3145
         '(needed for bzr-svn).',
3146
3146
    branch_format='bzrlib.branch.BzrBranchFormat7',
3147
 
    tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
 
3147
    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
3148
3148
    experimental=True,
3149
3149
    )
3150
3150
# The following two formats should always just be aliases.