Author: julianfoad
Date: Tue Jan 22 18:49:52 2013
New Revision: 1437097
URL: http://svn.apache.org/viewvc?rev=1437097&view=rev
Log:
Expose the 'diff_ignore_ancestry' option in the automatic merge API (which
is new since 1.7 so can be changed without deprecating).
* subversion/include/svn_client.h,
subversion/libsvn_client/merge.c
(svn_client_do_automatic_merge): Add a 'diff_ignore_ancestry' parameter.
* subversion/svn/merge-cmd.c
(automatic_merge): Same, and pass it through.
(svn_cl__merge): Pass FALSE for this new param to automatic_merge().
Modified:
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/svn/merge-cmd.c
Modified: subversion/trunk/subversion/include/svn_client.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1437097&r1=1437096&r2=1437097&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Tue Jan 22 18:49:52 2013
@@ -3510,6 +3510,7 @@ svn_error_t *
svn_client_do_automatic_merge(const svn_client_automatic_merge_t *merge,
const char *target_wcpath,
svn_depth_t depth,
+ svn_boolean_t diff_ignore_ancestry,
svn_boolean_t force_delete,
svn_boolean_t record_only,
svn_boolean_t dry_run,
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1437097&r1=1437096&r2=1437097&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Jan 22 18:49:52 2013
@@ -11618,6 +11618,7 @@ svn_error_t *
svn_client_do_automatic_merge(const svn_client_automatic_merge_t *merge,
const char *target_wcpath,
svn_depth_t depth,
+ svn_boolean_t diff_ignore_ancestry,
svn_boolean_t force_delete,
svn_boolean_t record_only,
svn_boolean_t dry_run,
@@ -11634,14 +11635,14 @@ svn_client_do_automatic_merge(const svn_
SVN_WC__CALL_WITH_WRITE_LOCK(
do_automatic_merge_locked(merge,
target_abspath, depth,
- FALSE /*diff_ignore_ancestry*/,
+ diff_ignore_ancestry,
force_delete, record_only, dry_run,
merge_options, ctx, pool),
ctx->wc_ctx, lock_abspath, FALSE /* lock_anchor */, pool);
else
SVN_ERR(do_automatic_merge_locked(merge,
target_abspath, depth,
- FALSE /*diff_ignore_ancestry*/,
+ diff_ignore_ancestry,
force_delete, record_only, dry_run,
merge_options, ctx, pool));
Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1437097&r1=1437096&r2=1437097&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Tue Jan 22 18:49:52 2013
@@ -69,6 +69,7 @@ automatic_merge(const char *source_path_
const svn_opt_revision_t *source_revision,
const char *target_wcpath,
svn_depth_t depth,
+ svn_boolean_t diff_ignore_ancestry,
svn_boolean_t force_delete,
svn_boolean_t record_only,
svn_boolean_t dry_run,
@@ -131,6 +132,7 @@ automatic_merge(const char *source_path_
/* Perform the 3-way merges */
SVN_ERR(svn_client_do_automatic_merge(merge, target_wcpath, depth,
+ diff_ignore_ancestry,
force_delete, record_only,
dry_run, merge_options,
ctx, scratch_pool));
@@ -433,6 +435,7 @@ svn_cl__merge(apr_getopt_t *os,
{
merge_err = automatic_merge(sourcepath1, &peg_revision1, targetpath,
opt_state->depth,
+ FALSE /*diff_ignore_ancestry*/,
opt_state->force, /* force_delete */
opt_state->record_only,
opt_state->dry_run,
