Rev 2467: Fix upgrade bug exposed via repository tests, dont replace dirstate format trees during upgrade. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

Robert Collins robertc at robertcollins.net
Tue Mar 6 06:53:28 GMT 2007


At http://bazaar.launchpad.net/~bzr/bzr/dirstate

------------------------------------------------------------
revno: 2467
revision-id: robertc at robertcollins.net-20070306065234-iq1i2xm003oxvaoi
parent: robertc at robertcollins.net-20070306063500-ihgarcmlv48p2gu0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Tue 2007-03-06 17:52:34 +1100
message:
  Fix upgrade bug exposed via repository tests, dont replace dirstate format trees during upgrade.
modified:
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2007-03-06 05:10:23 +0000
+++ b/bzrlib/bzrdir.py	2007-03-06 06:52:34 +0000
@@ -2088,6 +2088,7 @@
             # TODO: conversions of Branch and Tree should be done by
             # InterXFormat lookups
             if (isinstance(tree, workingtree.WorkingTree3) and
+                not isinstance(tree, workingtree_4.WorkingTree4) and
                 isinstance(self.target_format.workingtree_format,
                     workingtree_4.WorkingTreeFormat4)):
                 workingtree_4.Converter3to4().convert(tree)



More information about the bazaar-commits mailing list