Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c	(revision 6604)
+++ subversion/libsvn_wc/adm_ops.c	(working copy)
@@ -1015,6 +1015,24 @@
                                         parent_access, pool));
             }
         }
+      else
+        {
+          /*
+           * If it is a copied file, create a text base for it that is 
+           * identical to the file contents.
+           * */
+          const char * text_base_path;
+          apr_status_t status;
+          
+          text_base_path = svn_wc__text_base_path(path, 0, pool);
+          status = apr_file_copy (path, text_base_path, APR_OS_DEFAULT ,pool);
+          if (status != APR_SUCCESS)
+            {
+              return svn_error_createf (SVN_ERR_WC_FOUND_CONFLICT, NULL,
+                                        "Cannot copy working copy to text base: '%s'\n", 
+                                        path);  
+            }
+        }
     }
   else /* scheduling a directory for addition */
     {