# 
# 
# patch "tests/importing_cvs_files/__driver__.lua"
#  from [c1cc5497c211389954cbd34e61559a76cbb40e11]
#    to [0170dbd22fc9bc14c8a6d16d6f85754d5a4dabf1]
# 
# patch "tests/importing_cvs_files_with_identical_logs/__driver__.lua"
#  from [217dd79b2ee06eb698287b01c822ad6f20ab7458]
#    to [3cb0ee23b2ff8bf5307f24086e520efe5b931d7f]
# 
# patch "tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua"
#  from [1ad697fe5be65db5a0f03a9624c2040796eb8890]
#    to [a9bbce79a2f24f68156023636326bc1825b78146]
# 
============================================================
--- tests/importing_cvs_files/__driver__.lua	c1cc5497c211389954cbd34e61559a76cbb40e11
+++ tests/importing_cvs_files/__driver__.lua	0170dbd22fc9bc14c8a6d16d6f85754d5a4dabf1
@@ -1,16 +1,9 @@
 
 include("/common/cvs.lua")
 mtn_setup()
 
-writefile("importme.0", "version 0 of test file")
-writefile("importme.1", "version 1 of test file")
-writefile("importme.2", "version 2 of test file")
 writefile("importme.3", "version 3 of test file")
 
-tsha0=sha1("importme.0")
-tsha1=sha1("importme.1")
-tsha2=sha1("importme.2")
-tsha3=sha1("importme.3")
 
 -- build the cvs repository
 
@@ -22,15 +15,19 @@
 -- file modifications.
 check(cvs("co", "."), 0, false, false)
 mkdir("testdir")
-copy("importme.0", "testdir/importme")
+writefile("testdir/importme", "version 0 of test file")
+tsha0 = sha1("testdir/importme")
 check(cvs("add", "testdir"), 0, false, false)
 check(cvs("add", "testdir/importme"), 0, false, false)
 check(cvs("commit", "-m", 'commit 0', "testdir/importme"), 0, false, false)
-copy("importme.1", "testdir/importme")
+writefile("testdir/importme", "version 1 of test file")
+tsha1 = sha1("testdir/importme")
 check(cvs("commit", "-m", 'commit 1', "testdir/importme"), 0, false, false)
-copy("importme.2", "testdir/importme")
+writefile("testdir/importme", "version 2 of test file")
+tsha2 = sha1("testdir/importme")
 check(cvs("commit", "-m", 'commit 2', "testdir/importme"), 0, false, false)
-copy("importme.3", "testdir/importme")
+writefile("testdir/importme", "version 3 of test file")
+tsha3 = sha1("testdir/importme")
 check(cvs("commit", "-m", 'commit 3', "testdir/importme"), 0, false, false)
 
 -- import into monotone and check presence of files
============================================================
--- tests/importing_cvs_files_with_identical_logs/__driver__.lua	217dd79b2ee06eb698287b01c822ad6f20ab7458
+++ tests/importing_cvs_files_with_identical_logs/__driver__.lua	3cb0ee23b2ff8bf5307f24086e520efe5b931d7f
@@ -1,17 +1,9 @@
 
 include("/common/cvs.lua")
 mtn_setup()
 
-writefile("importme.0", "version 0 of test file")
-writefile("importme.1", "version 1 of test file")
-writefile("importme.2", "version 2 of test file")
 writefile("importme.3", "version 3 of test file")
 
-tsha0=sha1("importme.0")
-tsha1=sha1("importme.1")
-tsha2=sha1("importme.2")
-tsha3=sha1("importme.3")
-
 -- build the cvs repository
 
 cvs_setup()
@@ -20,15 +12,19 @@
 
 check(cvs("co", "."), 0, false, false)
 mkdir("testdir")
-copy("importme.0", "testdir/importme")
+writefile("testdir/importme", "version 0 of test file")
+tsha0 = sha1("testdir/importme")
 check(cvs("add", "testdir"), 0, false, false)
 check(cvs("add", "testdir/importme"), 0, false, false)
 check(cvs("commit", "-m", 'commit 0', "testdir/importme"), 0, false, false)
-copy("importme.1", "testdir/importme")
+writefile("testdir/importme", "version 1 of test file")
+tsha1 = sha1("testdir/importme")
 check(cvs("commit", "-m", 'commit same message', "testdir/importme"), 0, false, false)
-copy("importme.2", "testdir/importme")
+writefile("testdir/importme", "version 2 of test file")
+tsha2 = sha1("testdir/importme")
 check(cvs("commit", "-m", 'commit same message', "testdir/importme"), 0, false, false)
-copy("importme.3", "testdir/importme")
+writefile("testdir/importme", "version 3 of test file")
+tsha3 = sha1("testdir/importme")
 check(cvs("commit", "-m", 'commit 3', "testdir/importme"), 0, false, false)
 
 -- import into monotone and check presence of files
============================================================
--- tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua	1ad697fe5be65db5a0f03a9624c2040796eb8890
+++ tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua	a9bbce79a2f24f68156023636326bc1825b78146
@@ -1,46 +1,41 @@
 
 include("/common/cvs.lua")
 mtn_setup()
 cvs_setup()
 
-writefile("file1.0", "version 0 of test file1")
-writefile("file1.1", "version 1 of test file1")
-writefile("file1.2", "version 2 of test file1")
-writefile("file2.0", "version 0 of test file2")
-writefile("file2.1", "version 1 of test file2")
-writefile("changelog.0", "first changelog entry\n")
-
-check(cat("-", "changelog.0"), 0, true, false, "second changelog\n\n")
-rename("stdout", "changelog.1")
-
-check(cat("-", "changelog.1"), 0, true, false, "third changelog -not on branch-\n\n")
-rename("stdout", "changelog.2")
-
-check(cat("-", "changelog.1"), 0, true, false, "third changelog -on branch-\n\n")
-rename("stdout", "changelog.3")
-
-
 -- create the initial 3rd-party vendor import
 
 mkdir("importdir")
+writefile("file1.0", "version 0 of test file1")
 copy("file1.0", "importdir/file1")
+writefile("file2.0", "version 0 of test file2")
 copy("file2.0", "importdir/file2")
+writefile("changelog.0", "first changelog entry\n")
 copy("changelog.0", "importdir/changelog")
 check(indir("importdir", cvs("import", "-m", "Initial import of VENDORWARE 1", "testsrc", "VENDOR", "VENDOR_REL_1")), 0, false, false)
 
 -- now we alter some of the files.
 check(cvs("co", "testsrc"), 0, false, false)
+writefile("file1.1", "version 1 of test file1")
 copy("file1.1", "testsrc/file1")
+check(cat("-", "changelog.0"), 0, true, false, "second changelog\n\n")
+rename("stdout", "changelog.1")
 copy("changelog.1", "testsrc/changelog")
 check(indir("testsrc", cvs ("commit", "-m", 'commit 0')), 0, false, false)
 
+check(cat("-", "changelog.1"), 0, true, false, "third changelog -not on branch-\n\n")
+rename("stdout", "changelog.2")
 -- now we create a branch
 check(indir("testsrc", cvs ("tag", "-b", "branched")), 0, false, false)
 check(indir("testsrc", cvs ("up", "-r", "branched")), 0, false, false)
 
 -- alter the files on the branch
+writefile("file1.2", "version 2 of test file1")
 copy("file1.2", "testsrc/file1")
+writefile("file2.1", "version 1 of test file2")
 copy("file2.1", "testsrc/file2")
+check(cat("-", "changelog.1"), 0, true, false, "third changelog -on branch-\n\n")
+rename("stdout", "changelog.3")
 copy("changelog.3", "testsrc/changelog")
 check(indir("testsrc", cvs ("commit", "-m", 'commit on branch')), 0, false, false)