# 
# 
# add_dir "mtn_cvs/tests/pull_committemplate"
# 
# add_file "mtn_cvs/tests/pull_committemplate/__driver__.lua"
#  content [ec6a4efb193d93aecfb839ea4aa39618b6e853e4]
# 
# patch "mtn_cvs/testsuite.lua"
#  from [46e9ab440787a4f339536c74067bf08e19ecdb91]
#    to [141c5372daef3ebafeb2e37775bced0bfdf7ac7f]
# 
============================================================
--- mtn_cvs/tests/pull_committemplate/__driver__.lua	ec6a4efb193d93aecfb839ea4aa39618b6e853e4
+++ mtn_cvs/tests/pull_committemplate/__driver__.lua	ec6a4efb193d93aecfb839ea4aa39618b6e853e4
@@ -0,0 +1,44 @@
+-- pull of CVS module that has a commit template
+
+include("/common/cvs.lua")
+mtn_setup()
+cvs_setup()
+
+check(cvs("co","CVSROOT"),0,false,false)
+writefile("committemplate", "This ist my commit template\n")
+writefile("CVSROOT/rcsinfo", test.root.."/committemplate")
+check(cvs("commit","-m","adding commit template entry to rcsinfo","CVSROOT/rcsinfo"),0,false,false)
+
+check(cvs("co", "."),0,false,false)
+mkdir("testdir")
+writefile("testdir/importme","version 0 of test file\n")
+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)
+
+writefile("testdir/importme","version 1 of test file\n")
+tsha1 = sha1("testdir/importme")
+check(cvs("commit","-m","commit 1","testdir/importme"), 0, false, false)
+writefile("testdir/importme","version 2 of test file\n")
+tsha2 = sha1("testdir/importme")
+check(cvs("commit","-m","commit 2","testdir/importme"), 0, false, false)
+writefile("testdir/importme","version 3 of test file\n")
+tsha3 = sha1("testdir/importme")
+check(cvs("commit","-m","commit 3","testdir/importme"), 0, false, false)
+
+-- pull into monotone
+
+check(mtn_cvs("--branch=testbranch","pull",cvsroot,"testdir"),0, false,false)
+
+-- check presence of files
+
+check(mtn("automate", "get_file", tsha0), 0, false)
+check(mtn("automate", "get_file", tsha1), 0, false)
+check(mtn("automate", "get_file", tsha2), 0, false)
+check(mtn("automate", "get_file", tsha3), 0, false)
+
+-- also check that history is okay -- has the correct unique head
+
+check(mtn("checkout", "--branch=testbranch", "mtcodir"), 0, false, false)
+check(sha1("mtcodir/importme") == tsha3)
============================================================
--- mtn_cvs/testsuite.lua	46e9ab440787a4f339536c74067bf08e19ecdb91
+++ mtn_cvs/testsuite.lua	141c5372daef3ebafeb2e37775bced0bfdf7ac7f
@@ -275,7 +275,7 @@ table.insert(tests, "pull_separate")
 
 table.insert(tests, "pull_combined")
 table.insert(tests, "pull_separate")
---table.insert(tests, "pull_committemplate")
+table.insert(tests, "pull_committemplate")
 table.insert(tests, "pull_cvsbranch")
 --table.insert(tests, "pull_md5fail")
 table.insert(tests, "pull_rapid")