/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Aaron Bentley
  • Date: 2009-04-20 20:58:51 UTC
  • mto: This revision was merged to the branch mainline in revision 4302.
  • Revision ID: aaron@aaronbentley.com-20090420205851-r6s96npwkuto0n0q
Implement upgrade from branch format 7 to 8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
2787
2787
            while old != new:
2788
2788
                if (old == _mod_branch.BzrBranchFormat5 and
2789
2789
                    new in (_mod_branch.BzrBranchFormat6,
2790
 
                        _mod_branch.BzrBranchFormat7)):
 
2790
                        _mod_branch.BzrBranchFormat7,
 
2791
                        _mod_branch.BzrBranchFormat8)):
2791
2792
                    branch_converter = _mod_branch.Converter5to6()
2792
2793
                elif (old == _mod_branch.BzrBranchFormat6 and
2793
 
                    new == _mod_branch.BzrBranchFormat7):
 
2794
                    new in (_mod_branch.BzrBranchFormat7,
 
2795
                            _mod_branch.BzrBranchFormat8)):
2794
2796
                    branch_converter = _mod_branch.Converter6to7()
 
2797
                elif (old == _mod_branch.BzrBranchFormat7 and
 
2798
                      new is _mod_branch.BzrBranchFormat8):
 
2799
                    branch_converter = _mod_branch.Converter7to8()
2795
2800
                else:
2796
2801
                    raise errors.BadConversionTarget("No converter", new)
2797
2802
                branch_converter.convert(branch)