← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Robert Collins
  • Date: 2007-03-06 06:52:34 UTC
  • mto: (2321.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070306065234-iq1i2xm003oxvaoi
Fix upgrade bug exposed via repository tests, dont replace dirstate format trees during upgrade.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
2088
2088
            # TODO: conversions of Branch and Tree should be done by
2089
2089
            # InterXFormat lookups
2090
2090
            if (isinstance(tree, workingtree.WorkingTree3) and
 
2091
                not isinstance(tree, workingtree_4.WorkingTree4) and
2091
2092
                isinstance(self.target_format.workingtree_format,
2092
2093
                    workingtree_4.WorkingTreeFormat4)):
2093
2094
                workingtree_4.Converter3to4().convert(tree)