Author: julianfoad
Date: Sat Jan 19 01:38:17 2013
New Revision: 1435449
URL: http://svn.apache.org/viewvc?rev=1435449&view=rev
Log:
Following the rename of libsvn_client merge 'force' parameters to
'force_delete' in r1435401, change all their callers likewise.
* subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2ZLorg_apache_subversion_javahl_types_Depth_2ZZZ):
As above.
* subversion/bindings/javahl/native/SVNClient.h,
subversion/bindings/javahl/native/SVNClient.cpp
(SVNClient::merge): Same (in both variants of this function).
* subversion/svn/merge-cmd.c
(merge_reintegrate, automatic_merge, svn_cl__merge): Same.
Modified:
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/trunk/subversion/svn/merge-cmd.c
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1435449&r1=1435448&r2=1435449&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Sat Jan 19
01:38:17 2013
@@ -610,7 +610,7 @@ SVNClient::suggestMergeSources(const cha
void SVNClient::merge(const char *path1, Revision &revision1,
const char *path2, Revision &revision2,
- const char *localPath, bool force, svn_depth_t depth,
+ const char *localPath, bool forceDelete, svn_depth_t
depth,
bool ignoreAncestry, bool dryRun, bool recordOnly)
{
SVN::Pool subPool(pool);
@@ -634,13 +634,14 @@ void SVNClient::merge(const char *path1,
srcPath2.c_str(), revision2.revision(),
intLocalPath.c_str(),
depth,
- ignoreAncestry, force, recordOnly, dryRun,
+ ignoreAncestry, forceDelete, recordOnly,
+ dryRun,
TRUE, NULL, ctx, subPool.getPool()), );
}
void SVNClient::merge(const char *path, Revision &pegRevision,
std::vector<RevisionRange> &rangesToMerge,
- const char *localPath, bool force, svn_depth_t depth,
+ const char *localPath, bool forceDelete, svn_depth_t
depth,
bool ignoreAncestry, bool dryRun, bool recordOnly)
{
SVN::Pool subPool(pool);
@@ -666,7 +667,7 @@ void SVNClient::merge(const char *path,
pegRevision.revision(),
intLocalPath.c_str(),
depth,
- ignoreAncestry, force, recordOnly,
+ ignoreAncestry, forceDelete, recordOnly,
dryRun, TRUE, NULL, ctx,
subPool.getPool()), );
}
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=1435449&r1=1435448&r2=1435449&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Sat Jan 19
01:38:17 2013
@@ -96,13 +96,13 @@ class SVNClient :public SVNBase
svn_depth_t depth, StringArray &revProps,
LogMessageCallback *callback);
jobject suggestMergeSources(const char *path, Revision &pegRevision);
- void merge(const char *path1, Revision &revision1, const char *path2,
- Revision &revision2, const char *localPath, bool force,
- svn_depth_t depth, bool ignoreAncestry, bool dryRun,
- bool recordOnly);
+ void merge(const char *path1, Revision &revision1,
+ const char *path2, Revision &revision2,
+ const char *localPath, bool forceDelete, svn_depth_t depth,
+ bool ignoreAncestry, bool dryRun, bool recordOnly);
void merge(const char *path, Revision &pegRevision,
std::vector<RevisionRange> &rangesToMerge,
- const char *localPath, bool force, svn_depth_t depth,
+ const char *localPath, bool forceDelete, svn_depth_t depth,
bool ignoreAncestry, bool dryRun, bool recordOnly);
void mergeReintegrate(const char *path, Revision &pegRevision,
const char *localPath, bool dryRun);
Modified:
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1435449&r1=1435448&r2=1435449&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
(original)
+++
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
Sat Jan 19 01:38:17 2013
@@ -775,7 +775,7 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2ZLorg_apache_subversion_javahl_types_Depth_2ZZZ
(JNIEnv *env, jobject jthis, jstring jpath1, jobject jrevision1,
- jstring jpath2, jobject jrevision2, jstring jlocalPath, jboolean jforce,
+ jstring jpath2, jobject jrevision2, jstring jlocalPath, jboolean jforceDelete,
jobject jdepth, jboolean jignoreAncestry, jboolean jdryRun,
jboolean jrecordOnly)
{
@@ -807,7 +807,7 @@ Java_org_apache_subversion_javahl_SVNCli
return;
cl->merge(path1, revision1, path2, revision2, localPath,
- jforce ? true:false, EnumMapper::toDepth(jdepth),
+ jforceDelete ? true:false, EnumMapper::toDepth(jdepth),
jignoreAncestry ? true:false, jdryRun ? true:false,
jrecordOnly ? true:false);
}
@@ -815,7 +815,7 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_util_List_2Ljava_lang_String_2ZLorg_apache_subversion_javahl_types_Depth_2ZZZ
(JNIEnv *env, jobject jthis, jstring jpath, jobject jpegRevision,
- jobject jranges, jstring jlocalPath, jboolean jforce, jobject jdepth,
+ jobject jranges, jstring jlocalPath, jboolean jforceDelete, jobject jdepth,
jboolean jignoreAncestry, jboolean jdryRun, jboolean jrecordOnly)
{
JNIEntry(SVNClient, merge);
@@ -857,7 +857,7 @@ Java_org_apache_subversion_javahl_SVNCli
}
cl->merge(path, pegRevision, revisionRanges, localPath,
- jforce ? true:false, EnumMapper::toDepth(jdepth),
+ jforceDelete ? true:false, EnumMapper::toDepth(jdepth),
jignoreAncestry ? true:false, jdryRun ? true:false,
jrecordOnly ? true:false);
}
Modified: subversion/trunk/subversion/svn/merge-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/merge-cmd.c?rev=1435449&r1=1435448&r2=1435449&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/merge-cmd.c (original)
+++ subversion/trunk/subversion/svn/merge-cmd.c Sat Jan 19 01:38:17 2013
@@ -93,7 +93,7 @@ merge_reintegrate(const char *source_pat
SVN_ERR(svn_client_merge4(url1, &revision1, url2, &revision2,
target_wcpath, svn_depth_infinity,
FALSE /* ignore_ancestry */,
- FALSE /* force */,
+ FALSE /* force_delete */,
FALSE /* record_only */,
dry_run, TRUE /* allow_mixed_rev */,
merge_options, ctx, scratch_pool));
@@ -127,7 +127,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 force,
+ svn_boolean_t force_delete,
svn_boolean_t record_only,
svn_boolean_t dry_run,
svn_boolean_t allow_mixed_rev,
@@ -171,7 +171,7 @@ automatic_merge(const char *source_path_
"and the --depth option "
"cannot be used with this kind of merge"));
- if (force)
+ if (force_delete)
return svn_error_create(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
_("The required merge is reintegrate-like, "
"and the --force option "
@@ -189,7 +189,7 @@ automatic_merge(const char *source_path_
/* Perform the 3-way merges */
SVN_ERR(svn_client_do_automatic_merge(merge, target_wcpath, depth,
- force, record_only,
+ force_delete, record_only,
dry_run, merge_options,
ctx, scratch_pool));
@@ -484,7 +484,7 @@ svn_cl__merge(apr_getopt_t *os,
{
merge_err = automatic_merge(sourcepath1, &peg_revision1, targetpath,
opt_state->depth,
- opt_state->force,
+ opt_state->force, /* force_delete */
opt_state->record_only,
opt_state->dry_run,
opt_state->allow_mixed_rev,
@@ -531,7 +531,7 @@ svn_cl__merge(apr_getopt_t *os,
targetpath,
opt_state->depth,
opt_state->ignore_ancestry,
- opt_state->force,
+ opt_state->force, /* force_delete */
opt_state->record_only,
opt_state->dry_run,
opt_state->allow_mixed_rev,
@@ -555,7 +555,7 @@ svn_cl__merge(apr_getopt_t *os,
targetpath,
opt_state->depth,
opt_state->ignore_ancestry,
- opt_state->force,
+ opt_state->force, /* force_delete */
opt_state->record_only,
opt_state->dry_run,
opt_state->allow_mixed_rev,
