Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EB46A9995 for ; Thu, 2 Feb 2012 12:25:15 +0000 (UTC) Received: (qmail 48730 invoked by uid 500); 2 Feb 2012 12:25:15 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 48692 invoked by uid 500); 2 Feb 2012 12:25:15 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 48685 invoked by uid 99); 2 Feb 2012 12:25:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Feb 2012 12:25:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Feb 2012 12:25:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 19DF523888CD for ; Thu, 2 Feb 2012 12:24:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1239574 - /subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Date: Thu, 02 Feb 2012 12:24:54 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120202122454.19DF523888CD@eris.apache.org> Author: stsp Date: Thu Feb 2 12:24:53 2012 New Revision: 1239574 URL: http://svn.apache.org/viewvc?rev=1239574&view=rev Log: Follow-up to r1239553: Fix JavaHL build. * subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::Diff): Pass FALSE for the new ignore_prop_diff parameter of svn_client_diff6 and svn_client_diff_peg6(). While here, add comments identifying the use_git_diff_format parameter. Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1239574&r1=1239573&r2=1239574&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original) +++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Thu Feb 2 12:24:53 2012 @@ -971,7 +971,8 @@ void SVNClient::diff(const char *target1 noDiffDelete, showCopiesAsAdds, force, - FALSE, + FALSE, /* ignore_prop_diff */ + FALSE, /* use_git_diff_format */ SVN_APR_LOCALE_CHARSET, outputStream.getStream(subPool), NULL /* error file */, @@ -997,7 +998,8 @@ void SVNClient::diff(const char *target1 noDiffDelete, showCopiesAsAdds, force, - FALSE, + FALSE, /* ignore_prop_diff */ + FALSE, /* use_git_diff_format */ SVN_APR_LOCALE_CHARSET, outputStream.getStream(subPool), NULL /* error stream */,