~bzr-pqm/bzr/bzr.dev

Committer: Jelmer Vernooij
Date: 2011-02-04 18:30:09 UTC
mfrom: <a title="Merged From 5642.2.2" href="/~bzr-pqm/bzr/bzr.dev/revision/5642.2.2?remember=5582.10.41">(5642.2.2 extra-branch-formats)
mto: <a title="Merged In 5582.12.2" href="/~bzr-pqm/bzr/bzr.dev/revision/5582.12.2?remember=5582.10.41">(5582.12.2 weave-plugin)
mto: This revision was merged to the branch mainline in revision 5718 .
Revision ID: jelmer@samba.org-20110204183009-dsi2sznippcj6x0z

Merge extra branch work.

added added

removed removed

"Bazaar-NG branch, format 6\n", "bzrlib.plugins.weave_fmt.branch",

"BzrBranchFormat4")

from bzrlib.plugins.weave_fmt.branch import BzrBranchFormat4

branch.BranchFormat.register_extra_format(BzrBranchFormat4())

def load_tests(basic_tests, module, loader):

testmod_names = [