# # # patch "cmd_list.cc" # from [858f74882085edc9438d0d5c6022b794ec17aef3] # to [729a8937114986b7ab17763d665db8eeee72e293] # # patch "tests/duplicate_key_id/__driver__.lua" # from [ff11824ce16002f8e243a34da6e31b4ee1b8dfbf] # to [66ef2ab9ba1bfe2aa24bec1d651812265097ff58] # ============================================================ --- cmd_list.cc 858f74882085edc9438d0d5c6022b794ec17aef3 +++ cmd_list.cc 729a8937114986b7ab17763d665db8eeee72e293 @@ -466,7 +466,7 @@ CMD(keys, "keys", "", CMD_REF(list), "[P for (set::iterator i = duplicate_aliases.begin(); i != duplicate_aliases.end(); i++) { - W(F("Mismatched Key: %s") % *i); + P(F("Duplicate Key: %s") % *i); } } ============================================================ --- tests/duplicate_key_id/__driver__.lua ff11824ce16002f8e243a34da6e31b4ee1b8dfbf +++ tests/duplicate_key_id/__driver__.lua 66ef2ab9ba1bfe2aa24bec1d651812265097ff58 @@ -10,4 +10,4 @@ check(mtn("ls", "keys"), 0, false, true) check(mtn("commit", "-m", "try to commit with bad key in DB"), 0, false, true) check(mtn("ls", "keys"), 0, false, true) -check(qgrep("Mismatched Key: address@hidden", "stderr")) +check(qgrep("Duplicate Key: address@hidden", "stderr"))