← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repofmt/groupcompress_repo.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-13 09:07:18 UTC
  • mfrom: (6437.23.26 2.5)
  • mto: This revision was merged to the branch mainline in revision 6499.
  • Revision ID: v.ladeuil+lp@free.fr-20120313090718-2e5wf4d6otbh2k2r
Merge 2.5 branch including bugfix for #940164 and #944696

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repofmt/groupcompress_repo.py
758
758
            expected_chk_roots)
759
759
        missing_chk_roots = expected_chk_roots.difference(present_chk_roots)
760
760
        if missing_chk_roots:
761
 
            problems.append(
762
 
                "missing referenced chk root keys: %s."
763
 
                "Run 'bzr reconcile --canonicalize-chks' on the affected "
764
 
                "repository."
 
761
            problems.append("missing referenced chk root keys: %s"
765
762
                % (sorted(missing_chk_roots),))
766
763
            # Don't bother checking any further.
767
764
            return problems