You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/11/02 05:02:51 UTC
svn commit: r1538139 - in /subversion/branches/1.7.x: ./ STATUS
subversion/bindings/javahl/native/SVNClient.cpp
Author: svn-role
Date: Sat Nov 2 04:02:50 2013
New Revision: 1538139
URL: http://svn.apache.org/r1538139
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, brane
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNClient.cpp
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1524869
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1538139&r1=1538138&r2=1538139&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Nov 2 04:02:50 2013
@@ -168,13 +168,6 @@ 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, brane
-
* r1537360, r1537415, r1537555, r1537700
mod_dav_svn: Set r->filename to a bogus value rather than NULL.
Justification:
Modified: subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNClient.cpp?rev=1538139&r1=1538138&r2=1538139&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/1.7.x/subversion/bindings/javahl/native/SVNClient.cpp Sat Nov 2 04:02:50 2013
@@ -1138,7 +1138,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()),
);
}