Rev 3999: Fix bug #328135. in lp:///~jameinel/bzr/bug328135

John Arbash Meinel john at arbash-meinel.com
Thu Feb 12 16:11:39 GMT 2009


At lp:///~jameinel/bzr/bug328135

------------------------------------------------------------
revno: 3999
revision-id: john at arbash-meinel.com-20090212161113-bicnzfxkk96aeslv
parent: pqm at pqm.ubuntu.com-20090211084652-5z7uw3v922pope42
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bug328135
timestamp: Thu 2009-02-12 10:11:13 -0600
message:
  Fix bug #328135.
  We can't import bzrlib.workingtree_4 before importing bzrlib.workingtree
  Circular importing logic causes it to get partially-loaded modules which
  cause problems.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-02-11 08:46:52 +0000
+++ b/NEWS	2009-02-12 16:11:13 +0000
@@ -4,6 +4,15 @@
 
 .. contents::
 
+NOT RELEASED YET
+----------------
+
+  BUG FIXES:
+
+    * ``bzr init --development-wt5[-rich-root]`` would fail because of
+      circular import errors. (John Arbash Meinel, #328135)
+
+
 bzr 1.12rc1 "1234567890" 2009-02-10
 -----------------------------------
 

=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2009-02-09 06:38:29 +0000
+++ b/bzrlib/bzrdir.py	2009-02-12 16:11:13 +0000
@@ -3129,7 +3129,7 @@
     'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
     help='A working-tree format that supports views and content filtering.',
     branch_format='bzrlib.branch.BzrBranchFormat7',
-    tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
+    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
     experimental=True,
     )
 format_registry.register_metadir('development-wt5-rich-root',
@@ -3137,7 +3137,7 @@
     help='A variant of development-wt5 that supports rich-root data '
          '(needed for bzr-svn).',
     branch_format='bzrlib.branch.BzrBranchFormat7',
-    tree_format='bzrlib.workingtree_4.WorkingTreeFormat5',
+    tree_format='bzrlib.workingtree.WorkingTreeFormat5',
     experimental=True,
     )
 # The following two formats should always just be aliases.



More information about the bazaar-commits mailing list