/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: Robert Collins
  • Date: 2009-04-27 03:47:55 UTC
  • mfrom: (4303 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4304.
  • Revision ID: robertc@robertcollins.net-20090427034755-hzs5tk304glypj9j
Fixup NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
2942
2942
            while old != new:
2943
2943
                if (old == _mod_branch.BzrBranchFormat5 and
2944
2944
                    new in (_mod_branch.BzrBranchFormat6,
2945
 
                        _mod_branch.BzrBranchFormat7)):
 
2945
                        _mod_branch.BzrBranchFormat7,
 
2946
                        _mod_branch.BzrBranchFormat8)):
2946
2947
                    branch_converter = _mod_branch.Converter5to6()
2947
2948
                elif (old == _mod_branch.BzrBranchFormat6 and
2948
 
                    new == _mod_branch.BzrBranchFormat7):
 
2949
                    new in (_mod_branch.BzrBranchFormat7,
 
2950
                            _mod_branch.BzrBranchFormat8)):
2949
2951
                    branch_converter = _mod_branch.Converter6to7()
 
2952
                elif (old == _mod_branch.BzrBranchFormat7 and
 
2953
                      new is _mod_branch.BzrBranchFormat8):
 
2954
                    branch_converter = _mod_branch.Converter7to8()
2950
2955
                else:
2951
2956
                    raise errors.BadConversionTarget("No converter", new)
2952
2957
                branch_converter.convert(branch)