# # # patch "tests/importing_cvs_branches2/__driver__.lua" # from [f237f0cd8bf7ff3b0e4c9a615a11b622ecc6db69] # to [087b4df60a32631d9d2e58c018827790049a83d3] # # patch "tests/importing_cvs_with_multiple_vendor_imports/__driver__.lua" # from [fca0db73816e635ee9c347f7974e1124e6a98b28] # to [828e034fdc379cfd233d0a93a5d06541a8a02183] # ============================================================ --- tests/importing_cvs_branches2/__driver__.lua f237f0cd8bf7ff3b0e4c9a615a11b622ecc6db69 +++ tests/importing_cvs_branches2/__driver__.lua 087b4df60a32631d9d2e58c018827790049a83d3 @@ -42,7 +42,7 @@ check(mtn("list", "branches"), 0, true, -- check if all non-empty branches were imported check(mtn("list", "branches"), 0, true, false) -check(samelines("stdout", {"test", "test.A", "test.B", "test.C", "test.D"})) +check(samelines("stdout", {"test", "test.A", "test.C", "test.D"})) -- checkout the imported repository into maindir and branchdir check(mtn("checkout", "--branch=test", "maindir"), 0, false, false) ============================================================ --- tests/importing_cvs_with_multiple_vendor_imports/__driver__.lua fca0db73816e635ee9c347f7974e1124e6a98b28 +++ tests/importing_cvs_with_multiple_vendor_imports/__driver__.lua 828e034fdc379cfd233d0a93a5d06541a8a02183 @@ -6,7 +6,7 @@ check(get("cvs-repository")) -- import into monotone and check presence of files -check(mtn("--branch=test", "--debug", "cvs_import", "cvs-repository/test"), 0, false, false) +check(mtn("--branch=test", "cvs_import", "cvs-repository/test"), 0, false, false) -- check if all non-empty branches were imported check(mtn("list", "branches"), 0, true, false)