You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/06/25 01:19:48 UTC
svn commit: r1496294 - in
/subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native:
SVNClient.cpp SVNClient.h org_apache_subversion_javahl_SVNClient.cpp
Author: brane
Date: Mon Jun 24 23:19:47 2013
New Revision: 1496294
URL: http://svn.apache.org/r1496294
Log:
svn_client_merge_peg4 does not accept null revision ranges.
Modified:
subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
Modified: subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/SVNClient.cpp?rev=1496294&r1=1496293&r2=1496294&view=diff
==============================================================================
--- subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/SVNClient.cpp Mon Jun 24 23:19:47 2013
@@ -644,7 +644,7 @@ void SVNClient::merge(const char *path1,
}
void SVNClient::merge(const char *path, Revision &pegRevision,
- std::vector<RevisionRange> *rangesToMerge,
+ std::vector<RevisionRange> &rangesToMerge,
const char *localPath, bool forceDelete,
svn_depth_t depth, bool ignoreAncestry,
bool dryRun, bool recordOnly)
@@ -663,8 +663,7 @@ void SVNClient::merge(const char *path,
return;
apr_array_header_t *ranges =
- (!rangesToMerge ? NULL
- : rev_range_vector_to_apr_array(*rangesToMerge, subPool));
+ rev_range_vector_to_apr_array(rangesToMerge, subPool);
if (JNIUtil::isExceptionThrown())
return;
Modified: subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/SVNClient.h?rev=1496294&r1=1496293&r2=1496294&view=diff
==============================================================================
--- subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/SVNClient.h Mon Jun 24 23:19:47 2013
@@ -105,7 +105,7 @@ class SVNClient :public SVNBase
bool ignoreAncestry,
bool dryRun, bool recordOnly);
void merge(const char *path, Revision &pegRevision,
- std::vector<RevisionRange> *rangesToMerge,
+ std::vector<RevisionRange> &rangesToMerge,
const char *localPath, bool forceDelete, svn_depth_t depth,
bool ignoreAncestry,
bool dryRun, bool recordOnly);
Modified: subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1496294&r1=1496293&r2=1496294&view=diff
==============================================================================
--- subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/branches/javahl-1.7-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Mon Jun 24 23:19:47 2013
@@ -849,8 +849,7 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- std::vector<RevisionRange> *revisionRanges = NULL;
- std::vector<RevisionRange> realRevisionRanges;
+ std::vector<RevisionRange> revisionRanges;
// Build the revision range vector from the Java array.
if (jranges)
{
@@ -867,9 +866,8 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- realRevisionRanges.push_back(revisionRange);
+ revisionRanges.push_back(revisionRange);
}
- revisionRanges = &realRevisionRanges;
}
cl->merge(path, pegRevision, revisionRanges, localPath,