# # # rename "tests/importing_cvs_with_conflicting_tag/e" # to "tests/importing_cvs_with_conflicting_tag/cvs-repository" # # rename "tests/importing_cvs_with_missing_delta/e" # to "tests/importing_cvs_with_missing_delta/cvs-repository" # # rename "tests/importing_cvs_with_multiple_unnamed_branches/e" # to "tests/importing_cvs_with_multiple_unnamed_branches/cvs-repository" # # rename "tests/importing_cvs_with_unnamed_branch/e" # to "tests/importing_cvs_with_unnamed_branch/cvs-repository" # # patch "tests/importing_cvs_with_conflicting_tag/__driver__.lua" # from [2b769461a11260a96cc78a2fab44864a577c93ea] # to [4cb1fb8d617ce720eb7abb52deb78c4ae6e0b3d1] # # patch "tests/importing_cvs_with_missing_delta/__driver__.lua" # from [16a232a9a994f3d5c6b8e90721c57634f0a006a0] # to [f73f72500b1960855a7bffceb8a27dba1a80e883] # # patch "tests/importing_cvs_with_multiple_unnamed_branches/__driver__.lua" # from [55f4ec6dbadb7e4299a2eb95040514aa9057e046] # to [239d46a04926ddee84653018ff446be5aecc920a] # # patch "tests/importing_cvs_with_unnamed_branch/__driver__.lua" # from [9f021f83fbde4dca6dadd81ccaef2f9bd6f6312a] # to [5b26c2cfb6384bdb00019ee103dfd2b464c78020] # ============================================================ --- tests/importing_cvs_with_conflicting_tag/__driver__.lua 2b769461a11260a96cc78a2fab44864a577c93ea +++ tests/importing_cvs_with_conflicting_tag/__driver__.lua 4cb1fb8d617ce720eb7abb52deb78c4ae6e0b3d1 @@ -1,9 +1,9 @@ mtn_setup() mtn_setup() -check(get("e")) +check(get("cvs-repository")) -check(mtn("--branch=foo.bar", "cvs_import", "e"), 0, false, false) +check(mtn("--branch=foo.bar", "cvs_import", "cvs-repository"), 0, false, false) check(mtn("--branch=foo.bar", "co")) check(indir("foo.bar", mtn("list", "known")), 0, true) ============================================================ --- tests/importing_cvs_with_missing_delta/__driver__.lua 16a232a9a994f3d5c6b8e90721c57634f0a006a0 +++ tests/importing_cvs_with_missing_delta/__driver__.lua f73f72500b1960855a7bffceb8a27dba1a80e883 @@ -1,10 +1,10 @@ mtn_setup() -- very much based on importing_cvs_with_unnamed_branch, but -- has the branch including all its deltas deleted completely mtn_setup() -check(get("e")) +check(get("cvs-repository")) -check(mtn("--branch=test", "cvs_import", "e"), 1, false, true) +check(mtn("--branch=test", "cvs_import", "cvs-repository"), 1, false, true) check(samelines("stderr", {"mtn: error: delta for a branchpoint is missing (1.1.2.1)"})) ============================================================ --- tests/importing_cvs_with_multiple_unnamed_branches/__driver__.lua 55f4ec6dbadb7e4299a2eb95040514aa9057e046 +++ tests/importing_cvs_with_multiple_unnamed_branches/__driver__.lua 239d46a04926ddee84653018ff446be5aecc920a @@ -1,9 +1,9 @@ mtn_setup() mtn_setup() -check(get("e")) +check(get("cvs-repository")) -check(mtn("--branch=test", "cvs_import", "e"), 0, false, false) +check(mtn("--branch=test", "cvs_import", "cvs-repository"), 0, false, false) check(mtn("list", "branches"), 0, true, false) check(samelines("stdout", {"test", "test.BRANCH_FROM_UNNAMED_BRANCH_A", "test.BRANCH_FROM_UNNAMED_BRANCH_B"})) ============================================================ --- tests/importing_cvs_with_unnamed_branch/__driver__.lua 9f021f83fbde4dca6dadd81ccaef2f9bd6f6312a +++ tests/importing_cvs_with_unnamed_branch/__driver__.lua 5b26c2cfb6384bdb00019ee103dfd2b464c78020 @@ -1,9 +1,9 @@ mtn_setup() mtn_setup() -check(get("e")) +check(get("cvs-repository")) -check(mtn("--branch=test", "cvs_import", "e"), 0, false, false) +check(mtn("--branch=test", "cvs_import", "cvs-repository"), 0, false, false) check(mtn("list", "branches"), 0, true, false) check(samelines("stdout", {"test", "test.BRANCH_FROM_UNNAMED_BRANCH"}))