Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c	(revision 16166)
+++ subversion/libsvn_wc/adm_ops.c	(working copy)
@@ -1324,7 +1324,7 @@
   svn_error_t *err;
   apr_time_t tstamp;
   apr_array_header_t *propchanges;
-  svn_boolean_t magic_props_changed = FALSE;
+  svn_boolean_t force_change_working_file = FALSE;
 
   /* Build the full path of the thing we're reverting. */
   fullpath = svn_wc_adm_access_path (adm_access);
@@ -1364,7 +1364,7 @@
       
       /* Determine if any of the propchanges are the "magic" ones that
          might require changing the working file. */
-      magic_props_changed = svn_wc__has_magic_property (propchanges);
+      force_change_working_file = svn_wc__has_magic_property (propchanges);
   
       SVN_ERR (svn_wc__prop_path (&thing, fullpath, adm_access, FALSE, pool)); 
       SVN_ERR (svn_wc__prop_base_path (&base_thing, fullpath, adm_access, FALSE,
@@ -1463,13 +1463,17 @@
         if (disk_kind == svn_node_file)
           {
             SVN_ERR (svn_io_file_rename (revert_thing, base_thing, pool));
+            /* We have modified text base, therefore force change working
+               file. */
+            force_change_working_file = TRUE;
           }          
       }     
 
-      if (! magic_props_changed)
+      if (! force_change_working_file)
         SVN_ERR (svn_wc_text_modified_p (&modified_p, fullpath, FALSE,
                                          adm_access, pool));
-      if ((modified_p) || (kind == svn_node_none) || (magic_props_changed))
+      if ((modified_p) || (kind == svn_node_none) 
+          || (force_change_working_file))
         {
           /* If there are textual mods (or if the working file is
              missing altogether), copy the text-base out into
Index: subversion/tests/clients/cmdline/revert_tests.py
===================================================================
--- subversion/tests/clients/cmdline/revert_tests.py	(revision 16166)
+++ subversion/tests/clients/cmdline/revert_tests.py	(working copy)
@@ -398,7 +398,7 @@
               revert_replaced_file_without_props,
               XFail(revert_moved_file),
               revert_wc_to_wc_replace_with_props,
-              XFail(revert_file_merge_replace_with_history),
+              revert_file_merge_replace_with_history,
               revert_repos_to_wc_replace_with_props,
              ]