# 
# 
# patch "tests/checkout_does_not_clobber_workspace/__driver__.lua"
#  from [0aa5fe606349241ab73d78427f15ff60de065c0e]
#    to [0e1e6b0578395046eb6c66998c6cd09c55c361f3]
# 
============================================================
--- tests/checkout_does_not_clobber_workspace/__driver__.lua	0aa5fe606349241ab73d78427f15ff60de065c0e
+++ tests/checkout_does_not_clobber_workspace/__driver__.lua	0e1e6b0578395046eb6c66998c6cd09c55c361f3
@@ -10,18 +10,18 @@ check(indir("test1", mtn("checkout", "."
 check(indir("test1", mtn("checkout", ".")))
 
 -- checkout to workspace with an unversioned file blocking a versioned file
--- clobbers unversioned file
+-- still clobbers unversioned file; should not
 mkdir("test2")
 writefile("test2/file1", "blocker")
-check(indir("test2", mtn("checkout", ".")))
+xfail(indir("test2", mtn("checkout", ".")), 1, false, true)
 check(samefile("file1", "test2/file1"))
 
 -- checkout to workspace with an unversioned directory blocking a versioned directory
--- uses existing workspace directory
+-- uses existing workspace directory; should not
 mkdir("test3")
 mkdir("test3/foo")
 writefile("test3/foo/asdf", "asdf")
-check(indir("test3", mtn("checkout", ".")))
+xfail(indir("test3", mtn("checkout", ".")), 1, false, true)
 check(exists("test3/foo/asdf"))
 
 -- checkout to workspace with an unversioned directory blocking a versioned file