# # # add_dir "tests/add_unknown_recursive" # # add_file "tests/add_unknown_recursive/__driver__.lua" # content [718038d1d2f01f5d0f9d226cd0ceac0b5a0784ed] # # patch "cmd_ws_commit.cc" # from [cce91ef91465c3b3e52dec3a85b919b77aa8ee54] # to [fea44395b7bc5c218e9e4e12beb3e22344decc91] # ============================================================ --- tests/add_unknown_recursive/__driver__.lua 718038d1d2f01f5d0f9d226cd0ceac0b5a0784ed +++ tests/add_unknown_recursive/__driver__.lua 718038d1d2f01f5d0f9d226cd0ceac0b5a0784ed @@ -0,0 +1,13 @@ + +mtn_setup() + +mkdir("adddir") +writefile("adddir/test.txt", "A test file that won't be added unless --recursive is used\n") + +check(mtn("add", "--unknown"), 0, false, false) +check(mtn("ls", "known"), 0, true, false) +check(not qgrep("adddir/test.txt", "stdout")) +check(mtn("drop", "adddir"), 0, true, false) +check(mtn("add", "--unknown", "--recursive"), 0, false, false) +check(mtn("ls", "known"), 0, true, false) +check(qgrep("adddir/test.txt", "stdout")) ============================================================ --- cmd_ws_commit.cc cce91ef91465c3b3e52dec3a85b919b77aa8ee54 +++ cmd_ws_commit.cc fea44395b7bc5c218e9e4e12beb3e22344decc91 @@ -312,8 +312,6 @@ CMD(add, N_("workspace"), N_("[PATH]..." { if (!app.opts.unknown && (args.size() < 1)) throw usage(name); - N(!app.opts.unknown || !app.opts.recursive, - F("cannot set '--unknown' and '--recursive' at the same time")); app.require_workspace();