Bazaar

Merge lp:~jelmer/bzr/suggest-reconcile-canonicalize-chks into lp:bzr

  1. suggest-reconcile-canonicalize-chks
  2. Merge into bzr.dev
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: no longer in the source branch.
Merged at revision: 6543
Proposed branch: lp:~jelmer/bzr/suggest-reconcile-canonicalize-chks
Merge into: lp:bzr
Diff against target: 28 lines (+7/-1)
2 files modified
bzrlib/repofmt/groupcompress_repo.py (+4/-1)
doc/en/release-notes/bzr-2.6.txt (+3/-0)
To merge this branch: bzr merge lp:~jelmer/bzr/suggest-reconcile-canonicalize-chks
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve
Review via email: mp+116616@code.launchpad.net

Commit message

Suggest running 'bzr reconcile --canonicalize-chks' when hitting missing chk root reference errors.

Description of the change

Suggest the use of 'bzr reconcile --canonicalize-chks' when hitting a missing chk root references error.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

Doh !

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
2--- bzrlib/repofmt/groupcompress_repo.py 2012-02-23 19:45:15 +0000
3+++ bzrlib/repofmt/groupcompress_repo.py 2012-07-25 10:16:30 +0000
4@@ -758,7 +758,10 @@
5 expected_chk_roots)
6 missing_chk_roots = expected_chk_roots.difference(present_chk_roots)
7 if missing_chk_roots:
8- problems.append("missing referenced chk root keys: %s"
9+ problems.append(
10+ "missing referenced chk root keys: %s."
11+ "Run 'bzr reconcile --canonicalize-chks' on the affected "
12+ "repository."
13 % (sorted(missing_chk_roots),))
14 # Don't bother checking any further.
15 return problems
16
17=== modified file 'doc/en/release-notes/bzr-2.6.txt'
18--- doc/en/release-notes/bzr-2.6.txt 2012-07-24 12:53:36 +0000
19+++ doc/en/release-notes/bzr-2.6.txt 2012-07-25 10:16:30 +0000
20@@ -36,6 +36,9 @@
21 and would be ignored.
22 (Haw Loeung, #932515)
23
24+* When a missing referenced chk root error is encountered, bzr now suggests
25+ running ``bzr reconcile --canonicalize-chks``. (Jelmer Vernooij, #1021537)
26+
27 Documentation
28 *************
29