[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone: a4549e0dd9f2288465eb61bb885
From: |
code |
Subject: |
[Monotone-commits-diffs] net.venge.monotone: a4549e0dd9f2288465eb61bb885ceaaf07359776 |
Date: |
Tue, 26 Jun 2012 09:41:35 +0200 (CEST) |
revision: a4549e0dd9f2288465eb61bb885ceaaf07359776
date: 2012-06-25T10:52:51
author: address@hidden
branch: net.venge.monotone
changelog:
* src/database_check.cc (check_db): missing certs are minor, not serious
* test/func/pull_branch_vs_db_check/__driver__.lua: now passing as expected.
manifest:
format_version "1"
new_manifest [8386b600fe956dc1df7e126fd196ed5a593f37e1]
old_revision [258d377d0c3f35f4a696a125e1a8e6bcb3224be7]
patch "src/database_check.cc"
from [b926df22bc2ec6134600d55072462c9a3df1b8b3]
to [b5c6eb77f74e421e2ad7f86702cf1b49cc38aa22]
patch "test/func/pull_branch_vs_db_check/__driver__.lua"
from [928dc8f35c4976ccd7501d04bcdfaa7ea656e713]
to [65e0a47e3dc19cf4d1161f89c8fb7fddfa1de6e3]
============================================================
--- src/database_check.cc b926df22bc2ec6134600d55072462c9a3df1b8b3
+++ src/database_check.cc b5c6eb77f74e421e2ad7f86702cf1b49cc38aa22
@@ -1182,14 +1182,14 @@ check_db(database & db)
extra_branches + bad_branches + missing_branches;
// unreferenced files and rosters and mismatched certs are not actually
- // serious errors; odd, but nothing will break.
+ // serious errors; odd, but nothing will break. Similarly, missing and
+ // mismatched certs are not serious errors.
size_t serious = missing_files + missing_or_invalid_file_sizes +
incomplete_rosters + missing_rosters +
missing_revisions + incomplete_revisions +
non_parseable_revisions + non_normalized_revisions +
mismatched_parents + mismatched_children + manifest_mismatch +
bad_history +
- missing_certs +
unchecked_sigs + bad_sigs +
missing_keys +
missing_heights + duplicate_heights + incorrect_heights+
============================================================
--- test/func/pull_branch_vs_db_check/__driver__.lua 928dc8f35c4976ccd7501d04bcdfaa7ea656e713
+++ test/func/pull_branch_vs_db_check/__driver__.lua 65e0a47e3dc19cf4d1161f89c8fb7fddfa1de6e3
@@ -31,7 +31,7 @@ check(not qgrep("Name : branch", "stdou
check(mtn2("ls", "certs", ver0), 0, true, nil)
check(not qgrep("Name : branch", "stdout"))
--- and db check says this is a serious problem, but we'd like it not to.
-xfail(mtn2("db", "check"), 0, nil, true)
+-- db check now says this is only a minor problem
+check(mtn2("db", "check"), 0, nil, true)
check(qgrep("missing branch cert", "stderr"))
-check(qgrep("error: serious problems detected", "stderr"))
+check(qgrep("mtn: minor problems detected", "stderr"))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone: a4549e0dd9f2288465eb61bb885ceaaf07359776,
code <=