Index: subversion/libsvn_wc/update_editor.c
===================================================================
--- subversion/libsvn_wc/update_editor.c	(revision 18911)
+++ subversion/libsvn_wc/update_editor.c	(working copy)
@@ -2932,7 +2932,8 @@
   /* Set the new revision number and URL in the entry and clean up some other
      fields. */
   SVN_ERR(tweak_entry(log_accum, adm_access, base_name,
-                      ent->revision, new_URL, pool));
+                      dst_entry ? dst_entry->revision : ent->revision,
+                      new_URL, pool));
 
   SVN_ERR(install_added_props(log_accum, adm_access, dst_path,
                               new_base_props, new_props, pool));
Index: subversion/tests/cmdline/merge_tests.py
===================================================================
--- subversion/tests/cmdline/merge_tests.py	(revision 18912)
+++ subversion/tests/cmdline/merge_tests.py	(working copy)
@@ -3301,7 +3301,7 @@
               cherry_pick_text_conflict,
               merge_file_replace,
               merge_dir_replace,
-              XFail(merge_file_replace_to_mixed_rev_wc),
+              merge_file_replace_to_mixed_rev_wc,
              ]
 
 if __name__ == '__main__':