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/04/02 21:46:12 UTC
svn commit: r1463719 - in /subversion/trunk/subversion/bindings/javahl:
native/SVNClient.h src/org/apache/subversion/javahl/ISVNClient.java
src/org/apache/subversion/javahl/SVNClient.java
Author: brane
Date: Tue Apr 2 19:46:12 2013
New Revision: 1463719
URL: http://svn.apache.org/r1463719
Log:
Fix non-peg merge compatibility wrapper in JavaHL.
[in subversion/bindings/javahl/src/org/apache/subversion/javahl]
* SVNClient.java (SVNClient.merge): Fix silly typo in order of parameters in
wrapped call to native method.
* ISVNClient.java: Whitespace change, no functional difference.
* subversion/bindings/javahl/native/SVNClient.h (SVNClient::merge):
Remove extraneous overload declaration.
Modified:
subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=1463719&r1=1463718&r2=1463719&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Tue Apr 2 19:46:12 2013
@@ -100,16 +100,12 @@ class SVNClient :public SVNBase
void merge(const char *path1, Revision &revision1,
const char *path2, Revision &revision2,
const char *localPath, bool forceDelete, svn_depth_t depth,
- bool ignoreMergeInfo, bool diffIgnoreAncestry,
+ bool ignoreMergeinfo, bool diffIgnoreAncestry,
bool dryRun, bool recordOnly);
void merge(const char *path, Revision &pegRevision,
- std::vector<RevisionRange> &rangesToMerge,
- 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 forceDelete, svn_depth_t depth,
- bool ignoreMergeInfo, bool diffIgnoreAncestry,
+ bool ignoreMergeinfo, bool diffIgnoreAncestry,
bool dryRun, bool recordOnly);
void mergeReintegrate(const char *path, Revision &pegRevision,
const char *localPath, bool dryRun);
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1463719&r1=1463718&r2=1463719&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Tue Apr 2 19:46:12 2013
@@ -488,7 +488,6 @@ public interface ISVNClient
Set<String> suggestMergeSources(String path, Revision pegRevision)
throws SubversionException;
-
/**
* Merge changes from two paths into a new local path.
*
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1463719&r1=1463718&r2=1463719&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Tue Apr 2 19:46:12 2013
@@ -286,7 +286,7 @@ public class SVNClient implements ISVNCl
boolean recordOnly)
throws ClientException
{
- merge(path1, revision2, path2, revision2, localPath, force, depth,
+ merge(path1, revision1, path2, revision2, localPath, force, depth,
ignoreAncestry, ignoreAncestry, dryRun, recordOnly);
}