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 A14A7183A9 for ; Wed, 23 Sep 2015 12:05:52 +0000 (UTC) Received: (qmail 10556 invoked by uid 500); 23 Sep 2015 12:05:52 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 10519 invoked by uid 500); 23 Sep 2015 12:05:52 -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 10506 invoked by uid 99); 23 Sep 2015 12:05:52 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2015 12:05:52 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 111A21A7B99 for ; Wed, 23 Sep 2015 12:05:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 3.5 X-Spam-Level: *** X-Spam-Status: No, score=3.5 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RDNS_NONE=2.5] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id qiRsqpEj5hFl for ; Wed, 23 Sep 2015 12:05:51 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (unknown [209.188.14.139]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id 520F820F60 for ; Wed, 23 Sep 2015 12:05:51 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id C572EE046A for ; Wed, 23 Sep 2015 12:05:50 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 5D1523A06F5 for ; Wed, 23 Sep 2015 12:05:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1704825 - /subversion/trunk/subversion/libsvn_client/client.h Date: Wed, 23 Sep 2015 12:05:49 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150923120550.5D1523A06F5@svn01-us-west.apache.org> Author: rhuijben Date: Wed Sep 23 12:05:47 2015 New Revision: 1704825 URL: http://svn.apache.org/viewvc?rev=1704825&view=rev Log: Update some documentation to avoid regressions as the one fixed in r1703689. * subversion/libsvn_client/client.h (svn_client__get_normalized_stream): Following up on r1703689, tweak documentation. Modified: subversion/trunk/subversion/libsvn_client/client.h Modified: subversion/trunk/subversion/libsvn_client/client.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1704825&r1=1704824&r2=1704825&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/client.h (original) +++ subversion/trunk/subversion/libsvn_client/client.h Wed Sep 23 12:05:47 2015 @@ -1072,9 +1072,13 @@ svn_client__ensure_revprop_table(apr_has EXPAND_KEYWORDS operates as per the EXPAND argument to svn_subst_stream_translated, which see. If NORMALIZE_EOLS is TRUE and LOCAL_ABSPATH requires translation, then normalize the line endings in - *NORMAL_STREAM. + *NORMAL_STREAM to "\n" if the stream has svn:eol-style set. - Uses SCRATCH_POOL for temporary allocations. */ + Note that this IS NOT the repository normal form of the stream as that + would use "\r\n" if set to CRLF and "\r" if set to CR. + + The stream is allocated in RESULT_POOL and temporary SCRATCH_POOL is + used for temporary allocations. */ svn_error_t * svn_client__get_normalized_stream(svn_stream_t **normal_stream, svn_wc_context_t *wc_ctx,