# # # patch "tests/importing_cvs_with_conflicting_tag/__driver__.lua" # from [790085094cbc013e22af5f908051c70d6f13bd91] # to [b87d566fd428476bc823ece091afe2fa5d80d68a] # ============================================================ --- tests/importing_cvs_with_conflicting_tag/__driver__.lua 790085094cbc013e22af5f908051c70d6f13bd91 +++ tests/importing_cvs_with_conflicting_tag/__driver__.lua b87d566fd428476bc823ece091afe2fa5d80d68a @@ -33,10 +33,6 @@ check(samelines("foo.bar/testsrc/fileB", check(samelines("foo.bar/testsrc/fileA", {"Version 0 of fileA."})) 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. - - -- check contents at tag CONFLICTING_TAG check(indir("foo.bar", mtn("update", "-r", "CONFLICTING_TAG")), 0, false, false) check(indir("foo.bar", mtn("list", "known")), 0, true)