# 
# 
# patch "ChangeLog"
#  from [cf4798a0b5b9875f543afa03e1c5f11ddff16f86]
#    to [f7816b48f2be4aa63e71ee46e11fb97f7bd8aec6]
# 
# patch "tests/merge_into_workspace_files_added/__driver__.lua"
#  from [3c458c50158a77a7921be1ec59e04cd7ee5dceb9]
#    to [e09ec5adbbdd7e60dc85d72fbbb8029152a9cce3]
# 
============================================================
--- ChangeLog	cf4798a0b5b9875f543afa03e1c5f11ddff16f86
+++ ChangeLog	f7816b48f2be4aa63e71ee46e11fb97f7bd8aec6
@@ -1,3 +1,7 @@
+2007-02-07  Zack Weinberg  <address@hidden>
+
+	* tests/merge_into_workspace_files_added: Fix for workspace conflicts.
+
 2007-02-07  Matthew Gregan  <address@hidden>
 
 	* cmd_merging.cc (CMD(pluck)): Migrate to new internal
@@ -185,7 +189,7 @@ 2007-02-07  Daniel Carosone  <address@hidden
 	* tests/db_kill_rev_and_recommit/__driver__.lua/: add a test
 	(xfail'ed, until fixed) for a bug (#18990) I just tripped over,
 	whereby db_kill_rev_locally doesn't seem to kill enough.
-	
+
 2007-02-07  Markus Schiltknecht  <address@hidden>
 
 	* tests/test_a_merge_8/__driver__.lua: okay, sorry, that didn't work,
============================================================
--- tests/merge_into_workspace_files_added/__driver__.lua	3c458c50158a77a7921be1ec59e04cd7ee5dceb9
+++ tests/merge_into_workspace_files_added/__driver__.lua	e09ec5adbbdd7e60dc85d72fbbb8029152a9cce3
@@ -16,6 +16,7 @@ revert_to(anc)
 left = base_revision()
 
 revert_to(anc)
+check(remove("left"))
 check(get("right"))
 copy("right", "right.b")
 addfile("right")