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/06 11:14:52 UTC
svn commit: r1781879 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Mon Feb 6 11:14:52 2017
New Revision: 1781879
URL: http://svn.apache.org/viewvc?rev=1781879&view=rev
Log:
Re-do r1781862 correctly.
* subversion/libsvn_client/conflicts.c
(configure_option_incoming_move_file_merge,
configure_option_incoming_dir_merge): Use get_moved_to_repos_relpath() to
set the initial default path.
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1781879&r1=1781878&r2=1781879&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Feb 6 11:14:52 2017
@@ -9144,7 +9144,6 @@ configure_option_incoming_move_file_merg
incoming_change == svn_wc_conflict_action_delete)
{
const char *victim_abspath;
- apr_array_header_t *move_target_repos_relpaths;
const char *description;
victim_abspath = svn_client_conflict_get_local_abspath(conflict);
@@ -9164,27 +9163,12 @@ configure_option_incoming_move_file_merg
incoming_new_pegrev,
conflict->pool, scratch_pool));
}
- if (apr_hash_count(details->wc_move_targets) > 0)
- {
- svn_sort__item_t item;
- /* Initialize to the first possible move target. Hopefully,
- * in most cases there will only be one candidate anyway. */
- move_target_repos_relpaths =
- svn_sort__hash(details->wc_move_targets,
- svn_sort_compare_items_as_paths,
- scratch_pool);
- item = APR_ARRAY_IDX(move_target_repos_relpaths, 0,
- svn_sort__item_t);
- details->move_target_repos_relpath = item.key;
- details->wc_move_target_idx = 0;
- }
- else
- {
- details->move_target_repos_relpath = NULL;
- details->wc_move_target_idx = 0;
- return SVN_NO_ERROR;
- }
+ /* Initialize to the first possible move target. Hopefully,
+ * in most cases there will only be one candidate anyway. */
+ details->move_target_repos_relpath =
+ get_moved_to_repos_relpath(details, scratch_pool);
+ details->wc_move_target_idx = 0;
}
if (apr_hash_count(details->wc_move_targets) == 0)
@@ -9248,7 +9232,6 @@ configure_option_incoming_dir_merge(svn_
const char *description;
const char *wcroot_abspath;
const char *victim_abspath;
- apr_array_header_t *move_target_repos_relpaths;
victim_abspath = svn_client_conflict_get_local_abspath(conflict);
SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx,
@@ -9271,27 +9254,12 @@ configure_option_incoming_dir_merge(svn_
incoming_new_pegrev,
conflict->pool, scratch_pool));
}
- if (apr_hash_count(details->wc_move_targets) > 0)
- {
- svn_sort__item_t item;
- /* Initialize to the first possible move target. Hopefully,
- * in most cases there will only be one candidate anyway. */
- move_target_repos_relpaths =
- svn_sort__hash(details->wc_move_targets,
- svn_sort_compare_items_as_paths,
- scratch_pool);
- item = APR_ARRAY_IDX(move_target_repos_relpaths, 0,
- svn_sort__item_t);
- details->move_target_repos_relpath = item.key;
- details->wc_move_target_idx = 0;
- }
- else
- {
- details->move_target_repos_relpath = NULL;
- details->wc_move_target_idx = 0;
- return SVN_NO_ERROR;
- }
+ /* Initialize to the first possible move target. Hopefully,
+ * in most cases there will only be one candidate anyway. */
+ details->move_target_repos_relpath =
+ get_moved_to_repos_relpath(details, scratch_pool);
+ details->wc_move_target_idx = 0;
}
if (apr_hash_count(details->wc_move_targets) == 0)