svn commit: r932288 - /subversion/trunk/subversion/libsvn_wc/merge.c

[gs...@apache.org]

Author: gstein
Date: Fri Apr  9 08:00:27 2010
New Revision: 932288

URL: http://svn.apache.org/viewvc?rev=932288&view=rev
Log:
Fix a potential problem in merging behavior where a saved result doesn't
obey the proper translation data.

* subversion/libsvn_wc/merge.c:
  (save_merge_result): use loggy_translated_file, which allows us to
    specify the versioned node that has the translation details.
    EDITED_COPY is not versioned, so the loggy_copy logic cannot look up
    the proper translation details, whereas translated_file can.

Modified:
    subversion/trunk/subversion/libsvn_wc/merge.c

Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=932288&r1=932287&r2=932288&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Fri Apr  9 08:00:27 2010
@@ -416,8 +416,11 @@ save_merge_result(svn_wc__db_t *db,
                                      ".edited",
                                      svn_io_file_del_none,
                                      pool, pool));
-  SVN_ERR(svn_wc__loggy_copy(db, merge_dirpath,
-                             result_target, edited_copy, pool));
+  SVN_ERR(svn_wc__loggy_translated_file(db, merge_dirpath,
+                                        edited_copy,
+                                        result_target,
+                                        target_abspath,
+                                        pool));
 
   return SVN_NO_ERROR;
 }