Rev 6543: (jelmer) Suggest running 'bzr reconcile --canonicalize-chks' when hitting in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6543 [merge]
revision-id: pqm at pqm.ubuntu.com-20120725125257-5dudj9222zdwgknp
parent: pqm at pqm.ubuntu.com-20120724132542-5e7aakd1c3t9oggf
parent: jelmer at samba.org-20120725101107-hu0kvi2beq22yt0v
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2012-07-25 12:52:57 +0000
message:
  (jelmer) Suggest running 'bzr reconcile --canonicalize-chks' when hitting
   missing chk root reference errors. (Jelmer Vernooij)
modified:
  bzrlib/repofmt/groupcompress_repo.py repofmt.py-20080715094215-wp1qfvoo7093c8qr-1
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
--- a/bzrlib/repofmt/groupcompress_repo.py	2012-02-23 19:45:15 +0000
+++ b/bzrlib/repofmt/groupcompress_repo.py	2012-07-25 10:11:07 +0000
@@ -758,7 +758,10 @@
             expected_chk_roots)
         missing_chk_roots = expected_chk_roots.difference(present_chk_roots)
         if missing_chk_roots:
-            problems.append("missing referenced chk root keys: %s"
+            problems.append(
+                "missing referenced chk root keys: %s."
+                "Run 'bzr reconcile --canonicalize-chks' on the affected "
+                "repository."
                 % (sorted(missing_chk_roots),))
             # Don't bother checking any further.
             return problems

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-07-24 12:53:36 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-07-25 10:11:07 +0000
@@ -36,6 +36,9 @@
   and would be ignored.
   (Haw Loeung, #932515)
 
+* When a missing referenced chk root error is encountered, bzr now suggests
+  running ``bzr reconcile --canonicalize-chks``. (Jelmer Vernooij, #1021537)
+
 Documentation
 *************