subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1667682 - in /subversion/trunk/subversion: libsvn_wc/merge.c tests/cmdline/merge_tests.py
Date Thu, 19 Mar 2015 09:30:47 GMT
Author: stsp
Date: Thu Mar 19 09:30:47 2015
New Revision: 1667682

URL: http://svn.apache.org/r1667682
Log:
Revert r1667280.

As Bert pointed out historical behaviour and the svnbook disagree with the
change. We'll need some other way to fix the 'mine-full' binary file problem.

Discussion:
http://mail-archives.apache.org/mod_mbox/subversion-dev/201503.mbox/%3C01fd01d060f6%24f0d1ffa0%24d275fee0%24%40qqmail.nl%3E

Modified:
    subversion/trunk/subversion/libsvn_wc/merge.c
    subversion/trunk/subversion/tests/cmdline/merge_tests.py

Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1667682&r1=1667681&r2=1667682&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Thu Mar 19 09:30:47 2015
@@ -962,10 +962,9 @@ merge_text_file(svn_skel_t **work_items,
  * Copy* the files at LEFT_ABSPATH and RIGHT_ABSPATH into the same directory
  * as the target file, giving them unique names that start with the target
  * file's name and end with LEFT_LABEL and RIGHT_LABEL respectively.
- *
- * Copy the working state of the merge target to a unique name ending with
- * TARGET_LABEL. If the merge target has been 'detranslated' to repository
- * normal form, use the detranslated form instead of the working state.
+ * If the merge target has been 'detranslated' to repository normal form,
+ * move the detranslated file similarly to a unique name ending with
+ * TARGET_LABEL.
  *
  * ### * Why do we copy the left and right temp files when we could (maybe
  *     not always?) move them?
@@ -1036,31 +1035,26 @@ merge_binary_file(svn_skel_t **work_item
   SVN_ERR(svn_io_copy_file(left_abspath, left_copy, TRUE, pool));
   SVN_ERR(svn_io_copy_file(right_abspath, right_copy, TRUE, pool));
 
-  /* Create a .mine file too */
-  SVN_ERR(svn_io_open_uniquely_named(NULL,
-                                     &conflict_wrk,
-                                     merge_dirpath,
-                                     merge_filename,
-                                     target_label,
-                                     svn_io_file_del_none,
-                                     pool, pool));
-
   /* Was the merge target detranslated? */
   if (strcmp(mt->local_abspath, detranslated_target_abspath) != 0)
-    SVN_ERR(svn_wc__wq_build_file_move(work_items, mt->db,
-                                       mt->local_abspath,
-                                       detranslated_target_abspath,
-                                       conflict_wrk,
-                                       pool, result_pool));
+    {
+      /* Create a .mine file too */
+      SVN_ERR(svn_io_open_uniquely_named(NULL,
+                                         &conflict_wrk,
+                                         merge_dirpath,
+                                         merge_filename,
+                                         target_label,
+                                         svn_io_file_del_none,
+                                         pool, pool));
+      SVN_ERR(svn_wc__wq_build_file_move(work_items, mt->db,
+                                         mt->local_abspath,
+                                         detranslated_target_abspath,
+                                         conflict_wrk,
+                                         pool, result_pool));
+    }
   else
     {
-      /* Ensure .mine file is created (translation is a no-op).
-       * ### add workq API to copy without translation? */
-      SVN_ERR(svn_wc__wq_build_file_copy_translated(work_items, mt->db,
-                                                    mt->local_abspath,
-                                                    mt->local_abspath,
-                                                    conflict_wrk,
-                                                    pool, result_pool));
+      conflict_wrk = NULL;
     }
 
   /* Mark target_abspath's entry as "Conflicted", and start tracking

Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1667682&r1=1667681&r2=1667682&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Thu Mar 19 09:30:47 2015
@@ -16009,11 +16009,6 @@ def dry_run_merge_conflicting_binary(sbo
   'A/theta.merge-right.r3' :
     Item(contents= theta_contents + "some extra junk")
   })
-  # verify content of working backup ("mine") file
-  expected_disk.add({
-  'A/theta.working' :
-    Item(contents= theta_contents + "some other junk")
-  })
 
   expected_status = svntest.actions.get_virginal_state(other_wc, 1)
   expected_status.add({



Mime
View raw message