Author: svn-role
Date: Tue Oct 15 04:02:04 2013
New Revision: 1532178
URL: http://svn.apache.org/r1532178
Log:
Merge r1524869 from trunk:
* r1524869
JavaHL: Canonicalize path for streamFileContent method.
Justification:
JavaHL is designed around us doing the canonicalization.
Votes:
+1: breser, stefan2
+0: rhuijben
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/bindings/javahl/native/SVNClient.cpp
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1524869
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1532178&r1=1532177&r2=1532178&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Oct 15 04:02:04 2013
@@ -154,11 +154,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1524869
- JavaHL: Canonicalize path for streamFileContent method.
- Justification:
- JavaHL is designed around us doing the canonicalization.
- Votes:
- +1: breser, stefan2
- +0: rhuijben
Modified:
subversion/branches/1.8.x/subversion/bindings/javahl/native/SVNClient.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/bindings/javahl/native/SVNClient.cpp?rev=1532178&r1=1532177&r2=1532178&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/bindings/javahl/native/SVNClient.cpp
(original)
+++ subversion/branches/1.8.x/subversion/bindings/javahl/native/SVNClient.cpp
Tue Oct 15 04:02:04 2013
@@ -1169,7 +1169,7 @@ void SVNClient::streamFileContent(const
return;
SVN_JNI_ERR(svn_client_cat2(outputStream.getStream(subPool),
- path, pegRevision.revision(),
+ intPath.c_str(), pegRevision.revision(),
revision.revision(), ctx, subPool.getPool()),
);
}
