svn commit: r1782169 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/conflicts.c svn/conflict-callbacks.c

[ko...@apache.org]

Author: kotkov
Date: Wed Feb  8 13:56:58 2017
New Revision: 1782169

URL: http://svn.apache.org/viewvc?rev=1782169&view=rev
Log:
Update the conflict option description when a move target relpath is changed
via the svn_client_conflict_option_set_moved_to_repos_relpath() API.

See https://lists.apache.org/thread.html/1720e5bf18cc846271a4c681c4feb594cf49377afd833e446171bac7@%3Cdev.subversion.apache.org%3E

* subversion/include/svn_client.h
  (svn_client_conflict_option_set_moved_to_repos_relpath): Accept a client
   context.

* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_option_set_moved_to_repos_relpath): Update the
   option description, since the target path in the description could have
   changed.

* subversion/svn/conflict-callbacks.c
  (handle_tree_conflict): Pass the context when calling the
   svn_client_conflict_option_set_moved_to_repos_relpath() function.

Modified:
    subversion/trunk/subversion/include/svn_client.h
    subversion/trunk/subversion/libsvn_client/conflicts.c
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1782169&r1=1782168&r2=1782169&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Feb  8 13:56:58 2017
@@ -4495,6 +4495,7 @@ svn_error_t *
 svn_client_conflict_option_set_moved_to_repos_relpath(
   svn_client_conflict_option_t *option,
   int preferred_move_target_idx,
+  svn_client_ctx_t *ctx,
   apr_pool_t *scratch_pool);
 
 /**

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1782169&r1=1782168&r2=1782169&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Feb  8 13:56:58 2017
@@ -9414,6 +9414,7 @@ svn_error_t *
 svn_client_conflict_option_set_moved_to_repos_relpath(
   svn_client_conflict_option_t *option,
   int preferred_move_target_idx,
+  svn_client_ctx_t *ctx,
   apr_pool_t *scratch_pool)
 {
   svn_client_conflict_t *conflict = option->conflict;
@@ -9466,6 +9467,14 @@ svn_client_conflict_option_set_moved_to_
       if (strcmp(move_target_repos_relpath, repos_relpath) == 0)
         {
           details->move_target_repos_relpath = repos_relpath;
+          /* Update option description. */
+          SVN_ERR(describe_incoming_move_merge_conflict_option(
+                    &option->description,
+                    conflict, ctx,
+                    details,
+                    conflict->pool,
+                    scratch_pool));
+
           return SVN_NO_ERROR;
         }
     }

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1782169&r1=1782168&r2=1782169&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed Feb  8 13:56:58 2017
@@ -1751,7 +1751,8 @@ handle_tree_conflict(svn_boolean_t *reso
           if (conflict_option)
             {
               SVN_ERR(svn_client_conflict_option_set_moved_to_repos_relpath(
-                        conflict_option, preferred_move_target_idx, iterpool));
+                        conflict_option, preferred_move_target_idx,
+                        ctx, iterpool));
 
               /* Update option description. */
               SVN_ERR(build_tree_conflict_options(