# # # patch "dates.cc" # from [f212e00a503f5256fdf5a321c824965a2e49a835] # to [24dd854d8c1be66b65a57d813b756ddf13550848] # # patch "tests/commit_writes_message_back_to__MTN_log/__driver__.lua" # from [0f20f06596df2619cb17794e0243c9a5a7927604] # to [97b6bfdfbcd0698ac967b645b3883fc65d09f0f0] # # patch "tests/wrong_options_override_workspace_options/__driver__.lua" # from [f284f3ec4fbcd43ad0eff79f68c423ae09b9f5b7] # to [62b4258966df10f7a9073b00bc0c2d621a19128b] # ============================================================ --- dates.cc f212e00a503f5256fdf5a321c824965a2e49a835 +++ dates.cc 24dd854d8c1be66b65a57d813b756ddf13550848 @@ -452,7 +452,7 @@ date_t::from_formatted_localtime(string // strptime does *not* set the tm_isdst field in the broken down time // struct. setting it to -1 is apparently the way to tell mktime to - // determine out whether DST is in effect or not. + // determine whether DST is in effect or not. tb.tm_isdst = -1; ============================================================ --- tests/commit_writes_message_back_to__MTN_log/__driver__.lua 0f20f06596df2619cb17794e0243c9a5a7927604 +++ tests/commit_writes_message_back_to__MTN_log/__driver__.lua 97b6bfdfbcd0698ac967b645b3883fc65d09f0f0 @@ -4,8 +4,11 @@ addfile("testfile", "blah blah") addfile("testfile", "blah blah") --- ensure that the public key this test uses exists in the database --- before making it unwriteable +-- when a public key is first accessed it is automatically added to the database +-- but since this test removes write permission from the database this fails and +-- aborts the commit before the edit_comment hooks gets to run. running status +-- while the database is still writeable adds the key so that its available for +-- commit allowing the edit_comment hook to succeed. check(mtn("status"), 0, false, false) -- Make it unwriteable, so our edit_comment hook will have a chance to ============================================================ --- tests/wrong_options_override_workspace_options/__driver__.lua f284f3ec4fbcd43ad0eff79f68c423ae09b9f5b7 +++ tests/wrong_options_override_workspace_options/__driver__.lua 62b4258966df10f7a9073b00bc0c2d621a19128b @@ -27,6 +27,8 @@ writefile("not_a_dir", "bla") check(mtn_ws_opts("attr", "set", ".", "foo", "bar"), 0, false, false) writefile("not_a_dir", "bla") +-- status needs to be able to get the key to display an Author: header but is +-- unable to do so with a bad key dir check(mtn_ws_opts("status", "--keydir", "not_a_dir"), 1, false, false) check(mtn_ws_opts("commit", "-m", "another test"), 0, false, false)