You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2013/03/27 18:00:54 UTC
svn commit: r1461708 - in /subversion/trunk/subversion/libsvn_client:
client.h merge.c resolved.c
Author: julianfoad
Date: Wed Mar 27 17:00:54 2013
New Revision: 1461708
URL: http://svn.apache.org/r1461708
Log:
Rename and invert a private API parameter, for clarity.
* subversion/libsvn_client/client.h,
subversion/libsvn_client/resolved.c
(svn_client__resolve_conflicts): Rename and invert the sense of the
'resolved' output, to become 'conflicts_remain'.
* subversion/libsvn_client/merge.c
(do_merge): Track the change.
Suggested by: rhuijben
Modified:
subversion/trunk/subversion/libsvn_client/client.h
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/resolved.c
Modified: subversion/trunk/subversion/libsvn_client/client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1461708&r1=1461707&r2=1461708&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/client.h (original)
+++ subversion/trunk/subversion/libsvn_client/client.h Wed Mar 27 17:00:54 2013
@@ -1115,11 +1115,12 @@ svn_cl__rev_default_to_peg(const svn_opt
/* Call the conflict resolver callback in CTX for each conflict recorded
* in CONFLICTED_PATHS (const char *abspath keys; ignored values). If
- * RESOLVED is not NULL, then set *RESOLVED to true if all of the
- * conflicts were resolved, else to false.
+ * CONFLICTS_REMAIN is not NULL, then set *CONFLICTS_REMAIN to true if
+ * there are any conflicts among CONFLICTED_PATHS remaining unresolved
+ * at the end of this operation, else set it to false.
*/
svn_error_t *
-svn_client__resolve_conflicts(svn_boolean_t *resolved,
+svn_client__resolve_conflicts(svn_boolean_t *conflicts_remain,
apr_hash_t *conflicted_paths,
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1461708&r1=1461707&r2=1461708&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Mar 27 17:00:54 2013
@@ -9861,12 +9861,12 @@ do_merge(apr_hash_t **modified_subtrees,
* of them, go around again to merge the next sub-range (if any). */
if (conflicted_range_report && ctx->conflict_func2 && ! dry_run)
{
- svn_boolean_t resolved_all;
+ svn_boolean_t conflicts_remain;
SVN_ERR(svn_client__resolve_conflicts(
- &resolved_all, merge_cmd_baton.conflicted_paths,
+ &conflicts_remain, merge_cmd_baton.conflicted_paths,
ctx, iterpool));
- if (! resolved_all)
+ if (conflicts_remain)
break;
merge_cmd_baton.conflicted_paths = NULL;
Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1461708&r1=1461707&r2=1461708&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Wed Mar 27 17:00:54 2013
@@ -42,7 +42,7 @@
/*** Code. ***/
svn_error_t *
-svn_client__resolve_conflicts(svn_boolean_t *resolved,
+svn_client__resolve_conflicts(svn_boolean_t *conflicts_remain,
apr_hash_t *conflicted_paths,
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool)
@@ -50,8 +50,8 @@ svn_client__resolve_conflicts(svn_boolea
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
apr_hash_index_t *hi;
- if (resolved)
- *resolved = TRUE;
+ if (conflicts_remain)
+ *conflicts_remain = FALSE;
for (hi = (conflicted_paths
? apr_hash_first(scratch_pool, conflicted_paths) : NULL);
@@ -72,7 +72,7 @@ svn_client__resolve_conflicts(svn_boolea
ctx->notify_func2, ctx->notify_baton2,
iterpool));
- if (resolved)
+ if (conflicts_remain)
{
svn_boolean_t text_c, prop_c, tree_c;
@@ -80,7 +80,7 @@ svn_client__resolve_conflicts(svn_boolea
ctx->wc_ctx, local_abspath,
iterpool));
if (text_c || prop_c || tree_c)
- *resolved = FALSE;
+ *conflicts_remain = TRUE;
}
}
svn_pool_destroy(iterpool);