# 
# 
# add_dir "mtn_cvs/tests/pull_md5fail"
# 
# add_dir "mtn_cvs/tests/pull_md5fail/test"
# 
# add_dir "mtn_cvs/tests/pull_md5fail/test/Attic"
# 
# add_dir "mtn_cvs/tests/pull_md5fail/test/dir"
# 
# add_file "mtn_cvs/tests/pull_md5fail/__driver__.lua"
#  content [9ddab8abbaab3906bee1ce93ac8162b226fa3950]
# 
# add_file "mtn_cvs/tests/pull_md5fail/test/A,v"
#  content [1b32ae21727134819d01e0c54c3e44ce9e1236d0]
# 
# add_file "mtn_cvs/tests/pull_md5fail/test/B,v"
#  content [44415af020c9e217f50fc3d4157704c40578983d]
# 
# add_file "mtn_cvs/tests/pull_md5fail/test/dir/D,v"
#  content [2c17e8112e43b910090a1a4b7ab0ae5426e533f1]
# 
# patch "mtn_cvs/testsuite.lua"
#  from [cdbaa00a809fdc39f96852bfdc767b8c50f1524b]
#    to [8339314159b3c522337e0d3b6c0fb60e5ba36d70]
# 
============================================================
--- mtn_cvs/tests/pull_md5fail/__driver__.lua	9ddab8abbaab3906bee1ce93ac8162b226fa3950
+++ mtn_cvs/tests/pull_md5fail/__driver__.lua	9ddab8abbaab3906bee1ce93ac8162b226fa3950
@@ -0,0 +1,24 @@
+-- takeover modified, cvs commit, pull (causing MD5 failure)
+include("/common/cvs.lua")
+mtn_setup()
+
+cvs_setup()
+
+check(get("test", cvsroot.."/test"))
+
+check(cvs("co", "test"), 0, false, false)
+writefile("test/A", "new contents\nrevived\n")
+tsha1 = sha1("test/A")
+check(indir("test", mtn_cvs("--root=.", "--branch=testbranch", "takeover", "test")), 0, false, false)
+
+writefile("test/A", "new contents version 2\nrevived\n")
+tsha2 = sha1("test/A")
+check(indir("test", cvs("ci", "-m", "put different data into CVS")),0, false, false)
+check(mtn_cvs("--branch=testbranch", "pull"), 0, false, false)
+
+-- check for presence of file
+check(mtn("automate", "get_file", tsha1), 0, false)
+check(mtn("automate", "get_file", tsha2), 0, false)
+
+-- should do nothing
+check(mtn_cvs("--branch=testbranch", "pull"), 0, false, false)
============================================================
--- mtn_cvs/tests/pull_md5fail/test/A,v	1b32ae21727134819d01e0c54c3e44ce9e1236d0
+++ mtn_cvs/tests/pull_md5fail/test/A,v	1b32ae21727134819d01e0c54c3e44ce9e1236d0
@@ -0,0 +1,68 @@
+head	1.3;
+access;
+symbols
+	initial_import:1.1.1.1 vendor_tag:1.1.1;
+locks; strict;
+comment	@# @;
+
+
+1.3
+date	2005.10.16.14.36.04;	author christof;	state Exp;
+branches;
+next	1.2;
+
+1.2
+date	2005.10.16.14.35.59;	author christof;	state dead;
+branches;
+next	1.1;
+
+1.1
+date	2005.10.16.14.35.55;	author christof;	state Exp;
+branches
+	1.1.1.1;
+next	;
+
+1.1.1.1
+date	2005.10.16.14.35.55;	author christof;	state Exp;
+branches;
+next	;
+
+
+desc
+@@
+
+
+1.3
+log
address@hidden readded
+@
+text
address@hidden
+@
+
+
+1.2
+log
address@hidden removed
+@
+text
address@hidden 1
+a1 1
+initial import
+@
+
+
+1.1
+log
address@hidden revision
+@
+text
+@@
+
+
+1.1.1.1
+log
address@hidden import
+@
+text
+@@
============================================================
--- mtn_cvs/tests/pull_md5fail/test/B,v	44415af020c9e217f50fc3d4157704c40578983d
+++ mtn_cvs/tests/pull_md5fail/test/B,v	44415af020c9e217f50fc3d4157704c40578983d
@@ -0,0 +1,41 @@
+head	1.2;
+access;
+symbols;
+locks; strict;
+comment	@# @;
+
+
+1.2
+date	2005.10.16.14.36.00;	author christof;	state Exp;
+branches;
+next	1.1;
+
+1.1
+date	2005.10.16.14.35.57;	author christof;	state Exp;
+branches;
+next	;
+
+
+desc
+@@
+
+
+1.2
+log
address@hidden changed
+@
+text
address@hidden different
+@
+
+
+1.1
+log
address@hidden added
+@
+text
address@hidden 1
+a1 1
+file added
+@
+
============================================================
--- mtn_cvs/tests/pull_md5fail/test/dir/D,v	2c17e8112e43b910090a1a4b7ab0ae5426e533f1
+++ mtn_cvs/tests/pull_md5fail/test/dir/D,v	2c17e8112e43b910090a1a4b7ab0ae5426e533f1
@@ -0,0 +1,24 @@
+head	1.1;
+access;
+symbols;
+locks; strict;
+comment	@# @;
+
+
+1.1
+date	2005.10.16.14.36.02;	author christof;	state Exp;
+branches;
+next	;
+
+
+desc
+@@
+
+
+1.1
+log
address@hidden/D added
+@
+text
address@hidden subdir
+@
============================================================
--- mtn_cvs/testsuite.lua	cdbaa00a809fdc39f96852bfdc767b8c50f1524b
+++ mtn_cvs/testsuite.lua	8339314159b3c522337e0d3b6c0fb60e5ba36d70
@@ -277,7 +277,7 @@ table.insert(tests, "pull_cvsbranch")
 table.insert(tests, "pull_separate")
 table.insert(tests, "pull_committemplate")
 table.insert(tests, "pull_cvsbranch")
---table.insert(tests, "pull_md5fail")
+table.insert(tests, "pull_md5fail")
 table.insert(tests, "pull_rapid")
 table.insert(tests, "pull_samedirname")
 table.insert(tests, "pull_xmodule")