subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1748557 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Date Wed, 15 Jun 2016 11:19:54 GMT
Author: stsp
Date: Wed Jun 15 11:19:54 2016
New Revision: 1748557

URL: http://svn.apache.org/viewvc?rev=1748557&view=rev
Log:
* subversion/svn/conflict-callbacks.c
  (handle_prop_conflicts): Don't forget about telling the conflict option
   about a merged property value before trying to resolve the conflict with it.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1748557&r1=1748556&r2=1748557&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Jun 15 11:19:54 2016
@@ -1380,6 +1380,20 @@ handle_prop_conflicts(svn_boolean_t *res
       if (option_id != svn_client_conflict_option_unspecified &&
           option_id != svn_client_conflict_option_postpone)
         {
+          if (merged_propval)
+            {
+              apr_array_header_t *options;
+              svn_client_conflict_option_t *option;
+
+              SVN_ERR(svn_client_conflict_prop_get_resolution_options(
+                        &options, conflict, iterpool, iterpool));
+              option = svn_client_conflict_option_find_by_id(
+                         options, svn_client_conflict_option_merged_text);
+              if (option)
+                svn_client_conflict_option_set_merged_propval(option,
+                                                              merged_propval);
+            }
+
           SVN_ERR(mark_conflict_resolved(conflict, option_id,
                                          FALSE, propname, FALSE,
                                          path_prefix, conflict_stats,



Mime
View raw message