[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1771879 - /subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
From:       stsp () apache ! org
Date:       2016-11-29 10:43:39
Message-ID: 20161129104340.98FFB3A0EB1 () svn01-us-west ! apache ! org
[Download RAW message or body]

Author: stsp
Date: Tue Nov 29 10:43:39 2016
New Revision: 1771879

URL: http://svn.apache.org/viewvc?rev=1771879&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
  (create_conflict_markers): Allow setting 'merge' as an operation.

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

Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1771879&r1=1771878&r2=1771879&view=diff
 ==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Tue Nov 29 10:43:39 \
2016 @@ -1090,6 +1090,13 @@ create_conflict_markers(svn_skel_t **wor
                     conflicted_version,
                     scratch_pool, scratch_pool));
         }
+      else if (operation == svn_wc_operation_merge)
+        {
+          SVN_ERR(svn_wc__conflict_skel_set_op_merge(
+                    conflict_skel, original_version,
+                    conflicted_version,
+                    scratch_pool, scratch_pool));
+        }
       else
         {
           SVN_ERR(svn_wc__conflict_skel_set_op_switch(


[prev in list] [next in list] [prev in thread] [next in thread]