Author: vmpn
Date: Thu Dec 27 03:18:31 2012
New Revision: 1426112
URL: http://svn.apache.org/viewvc?rev=1426112&view=rev
Log:
On the javahl-ra branch:
Bring up-to-date with JavaHL changes on trunk@1409165
Modified:
subversion/branches/javahl-ra/ (props changed)
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
Propchange: subversion/branches/javahl-ra/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1409165
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp?rev=1426112&r1=1426111&r2=1426112&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
Thu Dec 27 03:18:31 2012
@@ -584,7 +584,7 @@ void SVNClient::doImport(const char *pat
return;
SVN_JNI_ERR(svn_client_import5(intPath.c_str(), intUrl.c_str(), depth,
- noIgnore, ignoreUnknownNodeTypes,
+ noIgnore, FALSE, ignoreUnknownNodeTypes,
revprops.hash(subPool),
ImportFilterCallback::callback, ifCallback,
CommitCallback::callback, commitCallback,
