# 
# add_file "tests/t_add_stomp_file.at"
# 
# patch "ChangeLog"
#  from [181287bddd749618979457d9b21a322a97aef769]
#    to [f873d1f0202e03df2753ba54508c28d303f3f23d]
# 
# patch "tests/t_add_stomp_file.at"
#  from []
#    to [ff7f16f34c202ec044ad232af78786bd119b5e98]
# 
# patch "testsuite.at"
#  from [63f222bf1549f1b5ea773c38860809fd131a88e4]
#    to [c9806d0931d6dec93838b7479f2d31b378be8453]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,12 @@
+2005-04-16  Emile Snyder  <address@hidden>
+
+	* tests/t_add_stomp_file.at: New test for failing case.  
+        If you have a file foo in your working dir (not monotone 
+        controlled) and someone else adds a file foo and commits, 
+        update should at least warn you before stomping your 
+        non-recoverable foo file.
+	* testsuite.at: Add it.
+	
 2005-04-17  Matt Johnston  <address@hidden>
 
 	* commands.cc: warn that dropkey won't truly erase the privkey
--- tests/t_add_stomp_file.at
+++ tests/t_add_stomp_file.at
@@ -0,0 +1,44 @@
+AT_SETUP([make sure update does not stomp non-monotone file])
+MONOTONE_SETUP
+
+# This test is a bug report
+AT_XFAIL_IF(true)
+
+# 1. Alice checks out project, creates file foo
+# 2. Bob checks out project, creates foo, adds foo, and commits
+# 3. Now Alice does an update
+#
+# monotone should warn her before stomping her non-revision controlled 'foo' file
+#
+
+AT_DATA(initial, [some initial data
+])
+
+AT_DATA(foo.alice, [foo
+not revision controlled
+])
+
+AT_DATA(foo.bob, [foo
+checked into project
+])
+
+# Alice make project, writes foo, but doesn't check it in
+AT_CHECK(mkdir alicewd)
+AT_CHECK(cp initial alicewd/initial)
+AT_CHECK(MONOTONE --branch=testbranch setup alicewd, [], [ignore], [ignore])
+AT_CHECK( (cd alicewd; MONOTONE --branch=testbranch --root=. add initial), [], [ignore], [ignore])
+AT_CHECK( (cd alicewd; MONOTONE --branch=testbranch --root=. commit -m 'initial commit'), [], [ignore], [ignore])
+AT_CHECK(cp foo.alice alicewd/foo)
+
+# Bob does add of file foo, and commits
+AT_CHECK(MONOTONE --branch=testbranch checkout bobwd, [], [ignore], [ignore])
+AT_CHECK(cp foo.bob bobwd/foo)
+AT_CHECK( (cd bobwd; MONOTONE --branch=testbranch --root=. add foo), [], [ignore], [ignore])
+AT_CHECK( (cd bobwd; MONOTONE --branch=testbranch --root=. commit -m 'bob commit'), [], [ignore], [ignore])
+REV=`BASE_REVISION`
+
+# Alice does her update, discovers foo has been stomped!
+AT_CHECK( (cd alicewd; MONOTONE --branch=testbranch --root=. update $REV), [], [ignore], [ignore])
+AT_CHECK(cmp foo.alice alicewd/foo)
+
+AT_CLEANUP
--- testsuite.at
+++ testsuite.at
@@ -562,3 +562,4 @@
 m4_include(tests/t_add_vs_commit.at)
 m4_include(tests/t_update_nonexistent.at)
 m4_include(tests/t_override_author_date.at)
+m4_include(tests/t_add_stomp_file.at)