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 2012/06/26 11:03:23 UTC
svn commit: r1353879 - /subversion/trunk/subversion/libsvn_client/switch.c
Author: stsp
Date: Tue Jun 26 09:03:22 2012
New Revision: 1353879
URL: http://svn.apache.org/viewvc?rev=1353879&view=rev
Log:
* subversion/libsvn_client/switch.c
(switch_internal): Simplify parameter passing to svn_wc__get_switch_editor()
based on the observation that if resolve_conflicts_post_switch is FALSE,
then ctx->conflict_func2 is NULL.
Suggested by: gstein
Modified:
subversion/trunk/subversion/libsvn_client/switch.c
Modified: subversion/trunk/subversion/libsvn_client/switch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/switch.c?rev=1353879&r1=1353878&r2=1353879&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/switch.c (original)
+++ subversion/trunk/subversion/libsvn_client/switch.c Tue Jun 26 09:03:22 2012
@@ -239,10 +239,7 @@ switch_internal(svn_revnum_t *result_rev
server_supports_depth,
diff3_cmd, preserved_exts,
svn_client__dirent_fetcher, &dfb,
- resolve_conflicts_post_switch ?
- NULL : ctx->conflict_func2,
- resolve_conflicts_post_switch ?
- NULL : ctx->conflict_baton2,
+ NULL, NULL, /* postpone conflicts */
NULL, NULL,
ctx->cancel_func, ctx->cancel_baton,
ctx->notify_func2, ctx->notify_baton2,