# 
# 
# patch "tests/importing_cvs_with_conflicting_tag/__driver__.lua"
#  from [597c359c3b1679ff3d151f49ae4c8a66645bb04a]
#    to [2b769461a11260a96cc78a2fab44864a577c93ea]
# 
# patch "tests/importing_cvs_with_conflicting_tag/e/testsrc/fileA,v"
#  from [8a698b2dabea6c9d265dda038f96f1ffcc48a39e]
#    to [4932dbddb90d09f80dd18b0c7945a011b14b0d92]
# 
# patch "tests/importing_cvs_with_conflicting_tag/e/testsrc/fileB,v"
#  from [d5c7a0ead1ee68b7b61cdaf8422c37ae0396e1e7]
#    to [25e30da21d97fc7ebdb0dd64e7cb5b0cd874d4d1]
# 
============================================================
--- tests/importing_cvs_with_conflicting_tag/__driver__.lua	597c359c3b1679ff3d151f49ae4c8a66645bb04a
+++ tests/importing_cvs_with_conflicting_tag/__driver__.lua	2b769461a11260a96cc78a2fab44864a577c93ea
@@ -7,10 +7,15 @@ check(indir("foo.bar", mtn("list", "know
 check(mtn("--branch=foo.bar", "co"))
 
 check(indir("foo.bar", mtn("list", "known")), 0, true)
-check(samelines("stdout", {"t", "t/libasm", "t/libasm/ChangeLog",
-                           "t/libelf-po", "t/libelf-po/POTFILES.in"}))
+check(samelines("stdout", {"testsrc", "testsrc/fileA", "testsrc/fileB"}))
 
 check(indir("foo.bar", mtn("list", "tags")), 0, true)
 check(grep("initial", "stdout"), 0, false, false)
+check(grep("CONFLICTING_TAG", "stdout"), 0, false, false)
+check(grep("ANOTHER_TAG", "stdout"), 0, false, false)
+
+check(indir("foo.bar", mtn("update", "-r", "CONFLICTING_TAG")), 0, false, false)
+check(indir("foo.bar", mtn("list", "known")), 0, true)
+check(samelines("stdout", {"testsrc", "testsrc/fileA", "testsrc/fileB"}))
+check(samelines("foo.bar/testsrc/fileA", {"Version 1 of fileA."}))
+check(samelines("foo.bar/testsrc/fileB", {"Version 0 of fileB."}))
-check(grep("portable-branch-base", "stdout"), 0, false, false)
-check(grep("portable-branch-fork", "stdout"), 0, false, false)
============================================================
--- tests/importing_cvs_with_conflicting_tag/e/testsrc/fileA,v	8a698b2dabea6c9d265dda038f96f1ffcc48a39e
+++ tests/importing_cvs_with_conflicting_tag/e/testsrc/fileA,v	4932dbddb90d09f80dd18b0c7945a011b14b0d92
@@ -1,7 +1,8 @@ symbols
 head	1.2;
 access;
 symbols
 	CONFLICTING_TAG:1.2
+    ANOTHER_TAG:1.1
 	initial:1.1.1.1
 	Vendor:1.1.1;
 locks; strict;
============================================================
--- tests/importing_cvs_with_conflicting_tag/e/testsrc/fileB,v	d5c7a0ead1ee68b7b61cdaf8422c37ae0396e1e7
+++ tests/importing_cvs_with_conflicting_tag/e/testsrc/fileB,v	25e30da21d97fc7ebdb0dd64e7cb5b0cd874d4d1
@@ -1,7 +1,8 @@ symbols
 head	1.2;
 access;
 symbols
 	CONFLICTING_TAG:1.1
+    ANOTHER_TAG:1.2
 	initial:1.1.1.1
 	Vendor:1.1.1;
 locks; strict;