You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2017/02/04 18:47:59 UTC
svn commit: r1781697 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Sat Feb 4 18:47:59 2017
New Revision: 1781697
URL: http://svn.apache.org/viewvc?rev=1781697&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(handle_tree_conflict): Update conflict description if the user chooses
an alternative move target path.
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=1781697&r1=1781696&r2=1781697&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Sat Feb 4 18:47:59 2017
@@ -1760,6 +1760,14 @@ handle_tree_conflict(svn_boolean_t *reso
&possible_moved_to_abspaths,
NULL, conflict, ctx,
scratch_pool, scratch_pool));
+
+ /* Update conflict description. */
+ SVN_ERR(svn_client_conflict_tree_get_description(
+ &incoming_change_description, &local_change_description,
+ conflict, ctx, scratch_pool, scratch_pool));
+ conflict_description = apr_psprintf(scratch_pool, "%s\n%s",
+ incoming_change_description,
+ local_change_description);
}
continue;
}