# 
# 
# add_dir "tests/checkout_clobbers_workspace"
# 
# add_file "tests/checkout_clobbers_workspace/__driver__.lua"
#  content [0aa5fe606349241ab73d78427f15ff60de065c0e]
# 
# patch "ChangeLog"
#  from [7b487b83eaa842ff43e35aa2ab0510c1253a0b90]
#    to [aaec1c0854f450a2eeee418a0048b36531db2b12]
# 
# patch "testsuite.lua"
#  from [d3183be3af86c27e3c66dd069726de3ee97e5f2d]
#    to [c873f86e951199d0a6c56252ecb0b5f547fb872a]
# 
============================================================
--- tests/checkout_clobbers_workspace/__driver__.lua	0aa5fe606349241ab73d78427f15ff60de065c0e
+++ tests/checkout_clobbers_workspace/__driver__.lua	0aa5fe606349241ab73d78427f15ff60de065c0e
@@ -0,0 +1,35 @@
+mtn_setup()
+
+mkdir("foo")
+addfile("file1", "file1")
+addfile("foo/file2", "foofile2")
+commit()
+
+-- checkout to clean workspace
+mkdir("test1")
+check(indir("test1", mtn("checkout", ".")))
+
+-- checkout to workspace with an unversioned file blocking a versioned file
+-- clobbers unversioned file
+mkdir("test2")
+writefile("test2/file1", "blocker")
+check(indir("test2", mtn("checkout", ".")))
+check(samefile("file1", "test2/file1"))
+
+-- checkout to workspace with an unversioned directory blocking a versioned directory
+-- uses existing workspace directory
+mkdir("test3")
+mkdir("test3/foo")
+writefile("test3/foo/asdf", "asdf")
+check(indir("test3", mtn("checkout", ".")))
+check(exists("test3/foo/asdf"))
+
+-- checkout to workspace with an unversioned directory blocking a versioned file
+mkdir("test4")
+mkdir("test4/file1")
+check(indir("test4", mtn("checkout", ".")), 1, false, true)
+
+-- checkout to workspace with an unversioned file blocking a versioned directory
+mkdir("test5")
+writefile("test5/foo", "foobar")
+check(indir("test5", mtn("checkout", ".")), 1, false, true)
============================================================
--- ChangeLog	7b487b83eaa842ff43e35aa2ab0510c1253a0b90
+++ ChangeLog	aaec1c0854f450a2eeee418a0048b36531db2b12
@@ -1,5 +1,11 @@ 2006-12-28  Derek Scherger  <address@hidden
 2006-12-28  Derek Scherger  <address@hidden>
 
+	* tests/checkout_clobbers_workspace/__driver__.lua: new test to
+	see how checkout handles various workspace conflicts
+	* testsuite.lua: call it
+	
+2006-12-28  Derek Scherger  <address@hidden>
+
 	* tests/missing_empty_dir/__driver__.lua: new test for missing,
 	empty, versioned directories 
 	* testsuite.lua: call it
============================================================
--- testsuite.lua	d3183be3af86c27e3c66dd069726de3ee97e5f2d
+++ testsuite.lua	c873f86e951199d0a6c56252ecb0b5f547fb872a
@@ -698,4 +698,5 @@ table.insert(tests, "missing_empty_dir")
 table.insert(tests, "fail_cleanly_when__MTN_format_corrupt")
 table.insert(tests, "add_ignores__MTN")
 table.insert(tests, "missing_empty_dir")
+table.insert(tests, "checkout_clobbers_workspace")