#
#
# patch "tests/importing_cvs_with_conflicting_tag/__driver__.lua"
#  from [7f6693dfed3e8b8bd00871662303bf2e8354a177]
#    to [790085094cbc013e22af5f908051c70d6f13bd91]
# 
# patch "tests/importing_cvs_with_conflicting_tag2/__driver__.lua"
#  from [7422b2e07e9440a6305b7616d6594e3861170c49]
#    to [507762a5a7c00c58adb61d916809174dada05c40]
#
============================================================
--- tests/importing_cvs_with_conflicting_tag/__driver__.lua	7f6693dfed3e8b8bd00871662303bf2e8354a177
+++ tests/importing_cvs_with_conflicting_tag/__driver__.lua	790085094cbc013e22af5f908051c70d6f13bd91
@@ -31,7 +31,7 @@ check(samelines("foo.bar/testsrc/fileA",
 check(indir("foo.bar", mtn("list", "known")), 0, true)
 check(samelines("stdout", {"testsrc", "testsrc/fileA", "testsrc/fileB"}))
 check(samelines("foo.bar/testsrc/fileA", {"Version 0 of fileA."}))
-xfail(samelines("foo.bar/testsrc/fileB", {"Version 1 of fileB."}))
+check(samelines("foo.bar/testsrc/fileB", {"Version 1 of fileB."}))
 
 -- Currently, ANOTHER_TAG gets split correctly, but then we simply override
 -- ANOTHER_TAG as soon as the second blob with the same tag is consumed.
============================================================
--- tests/importing_cvs_with_conflicting_tag2/__driver__.lua	7422b2e07e9440a6305b7616d6594e3861170c49
+++ tests/importing_cvs_with_conflicting_tag2/__driver__.lua	507762a5a7c00c58adb61d916809174dada05c40
@@ -1,21 +1,28 @@ check(get("cvs-repository"))
 mtn_setup()
 
 -- see makerepo.sh
 check(get("cvs-repository"))
 
-xfail(mtn("--branch=testbranch", "cvs_import", "cvs-repository"), 0, false, false)
-check(mtn("co", "-r", "t:NASTY_TAG", "."))
+check(mtn("--branch=testbranch", "cvs_import", "cvs-repository"), 0, false, false)
+remove("_MTN")
+check(mtn("co", "-r", "t:NASTY_TAG", "."), 0, false, false)
 
 check(mtn("list", "known"), 0, true)
-check(samelines("stdout", {"fileA", "fileB", "fileC", "fileD", "fileE", "fileF"}))
+check(samelines("stdout", {"test",
+                           "test/fileA",
+                           "test/fileB",
+                           "test/fileC",
+                           "test/fileD",
+                           "test/fileE",
+                           "test/fileF"}))
 
 check(mtn("list", "tags"), 0, true)
 
 -- check contents at tag NASTY_TAG
-check(samelines("test/fileA", {"version 0 of test fileA."}))
-check(samelines("test/fileB", {"version 1 of test fileB."}))
-check(samelines("test/fileC", {"version 2 of test fileC."}))
-check(samelines("test/fileD", {"version 3 of test fileD."}))
-check(samelines("test/fileE", {"version 4 of test fileE."}))
-check(samelines("test/fileF", {"version 5 of test fileF."}))
+check(samelines("test/fileA", {"version 0 of test fileA"}))
+check(samelines("test/fileB", {"version 1 of test fileB"}))
+check(samelines("test/fileC", {"version 2 of test fileC"}))
+check(samelines("test/fileD", {"version 3 of test fileD"}))
+check(samelines("test/fileE", {"version 4 of test fileE"}))
+check(samelines("test/fileF", {"version 5 of test fileF"}))