← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-23 20:47:30 UTC
  • mfrom: (4273.1.15 branch-subtree-locations)
  • Revision ID: pqm@pqm.ubuntu.com-20090423204730-kcbq9na0n3zs2y3l
(abentley) store tree-references in a new branch format.

Show diffs side-by-side

added added

removed removed

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