← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/__init__.py

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/__init__.py
19
19
These were formats present in pre-1.0 version of Bazaar.
20
20
"""
21
21
 
 
22
# Since we are a built-in plugin we share the bzrlib version
 
23
from bzrlib import version_info
 
24
 
22
25
from bzrlib import (
23
26
    branch as _mod_branch,
24
27
    controldir,
82
85
    'bzrlib.plugins.weave_fmt.repository.RepositoryFormat7',
83
86
    'Transitional format in 0.8.  Slower than knit.',
84
87
    branch_format='bzrlib.branch.BzrBranchFormat5',
85
 
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
 
88
    tree_format='bzrlib.workingtree_3.WorkingTreeFormat3',
86
89
    hidden=True,
87
90
    deprecated=True)
88
91