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 2012/03/22 10:42:09 UTC
svn commit: r1303703 - /subversion/trunk/subversion/svn/merge-cmd.c
Author: julianfoad
Date: Thu Mar 22 09:42:08 2012
New Revision: 1303703
URL: http://svn.apache.org/viewvc?rev=1303703&view=rev
Log:
Code clarification.
* subversion/svn/merge-cmd.c
(svn_cl__merge): Create boolean variables to give names to the two
meanings of one boolean condition.
Modified:
subversion/trunk/subversion/svn/merge-cmd.c
Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1303703&r1=1303702&r2=1303703&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Thu Mar 22 09:42:08 2012
@@ -387,6 +387,9 @@ svn_cl__merge(apr_getopt_t *os,
#ifdef SVN_WITH_SYMMETRIC_MERGE
if (opt_state->symmetric_merge)
{
+ svn_boolean_t allow_local_mods = ! opt_state->reintegrate;
+ svn_boolean_t allow_switched_subtrees = ! opt_state->reintegrate;
+
if (two_sources_specified)
return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
_("SOURCE2 can't be used with --symmetric"));
@@ -403,8 +406,8 @@ svn_cl__merge(apr_getopt_t *os,
opt_state->record_only,
opt_state->dry_run,
opt_state->allow_mixed_rev,
- ! opt_state->reintegrate,
- ! opt_state->reintegrate,
+ allow_local_mods,
+ allow_switched_subtrees,
options, ctx, pool);
}
else