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/08/06 20:27:28 UTC
svn commit: r1369912 - in /subversion/trunk/subversion:
include/private/svn_client_private.h libsvn_client/merge.c svn/merge-cmd.c
Author: julianfoad
Date: Mon Aug 6 18:27:28 2012
New Revision: 1369912
URL: http://svn.apache.org/viewvc?rev=1369912&view=rev
Log:
Remove the #ifdef SVN_WITH_SYMMETRIC_MERGE marker that was surrounding most
of the symmetric merge code.
* subversion/include/private/svn_client_private.h,
subversion/libsvn_client/merge.c,
subversion/svn/merge-cmd.c
Remove definition and all uses of SVN_WITH_SYMMETRIC_MERGE.
Modified:
subversion/trunk/subversion/include/private/svn_client_private.h
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/svn/merge-cmd.c
Modified: subversion/trunk/subversion/include/private/svn_client_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_client_private.h?rev=1369912&r1=1369911&r2=1369912&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_client_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_client_private.h Mon Aug 6 18:27:28 2012
@@ -178,11 +178,6 @@ svn_client__wc_node_get_origin(svn_clien
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* A macro to mark sections of code that belong to the 'symmetric merge'
- * feature while it's still new. */
-#define SVN_WITH_SYMMETRIC_MERGE
-
-#ifdef SVN_WITH_SYMMETRIC_MERGE
/* Details of a symmetric merge. */
typedef struct svn_client__symmetric_merge_t
@@ -235,7 +230,6 @@ svn_client__do_symmetric_merge(const svn
svn_client_ctx_t *ctx,
apr_pool_t *scratch_pool);
-#endif /* SVN_WITH_SYMMETRIC_MERGE */
#ifdef __cplusplus
}
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1369912&r1=1369911&r2=1369912&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Aug 6 18:27:28 2012
@@ -11079,7 +11079,6 @@ svn_client_merge_peg4(const char *source
return SVN_NO_ERROR;
}
-#ifdef SVN_WITH_SYMMETRIC_MERGE
/* The location-history of a branch.
*
@@ -11753,5 +11752,3 @@ svn_client__do_symmetric_merge(const svn
return SVN_NO_ERROR;
}
-
-#endif /* SVN_WITH_SYMMETRIC_MERGE */
Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1369912&r1=1369911&r2=1369912&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Mon Aug 6 18:27:28 2012
@@ -104,7 +104,6 @@ ensure_wc_path_has_repo_revision(const c
return SVN_NO_ERROR;
}
-#ifdef SVN_WITH_SYMMETRIC_MERGE
/* Symmetric, merge-tracking merge, used for sync or reintegrate purposes. */
static svn_error_t *
symmetric_merge(const char *source_path_or_url,
@@ -168,7 +167,6 @@ symmetric_merge(const char *source_path_
return SVN_NO_ERROR;
}
-#endif
/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
@@ -433,7 +431,6 @@ svn_cl__merge(apr_getopt_t *os,
/* Postpone conflict resolution during the merge operation.
* If any conflicts occur we'll run the conflict resolver later. */
-#ifdef SVN_WITH_SYMMETRIC_MERGE
/* Do a symmetric merge if just one source and no revisions. */
if ((! two_sources_specified)
&& (! opt_state->reintegrate)
@@ -459,9 +456,7 @@ svn_cl__merge(apr_getopt_t *os,
allow_switched_subtrees,
options, ctx, pool);
}
- else
-#endif
- if (opt_state->reintegrate)
+ else if (opt_state->reintegrate)
{
SVN_ERR_W(svn_cl__check_related_source_and_target(
sourcepath1, &peg_revision1, targetpath, &unspecified,