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 44873FB51 for ; Sat, 27 Apr 2013 16:56:48 +0000 (UTC) Received: (qmail 73863 invoked by uid 500); 27 Apr 2013 16:56:48 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 73834 invoked by uid 500); 27 Apr 2013 16:56:48 -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 73827 invoked by uid 99); 27 Apr 2013 16:56:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Apr 2013 16:56:48 +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; Sat, 27 Apr 2013 16:56:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EC90723889FA; Sat, 27 Apr 2013 16:56:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1476622 - /subversion/trunk/subversion/libsvn_wc/workqueue.h Date: Sat, 27 Apr 2013 16:56:24 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130427165624.EC90723889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: julianfoad Date: Sat Apr 27 16:56:24 2013 New Revision: 1476622 URL: http://svn.apache.org/r1476622 Log: * subversion/libsvn_wc/workqueue.h (svn_wc__wq_merge): Document memory allocation (it's shallow). Modified: subversion/trunk/subversion/libsvn_wc/workqueue.h Modified: subversion/trunk/subversion/libsvn_wc/workqueue.h URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.h?rev=1476622&r1=1476621&r2=1476622&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/workqueue.h (original) +++ subversion/trunk/subversion/libsvn_wc/workqueue.h Sat Apr 27 16:56:24 2013 @@ -73,7 +73,11 @@ extern "C" { These will be combined as appropriate, and returned in one of the above three styles. - The resulting list will be ordered: WORK_ITEM1 first, then WORK_ITEM2 */ + The resulting list will be ordered: WORK_ITEM1 first, then WORK_ITEM2. + + The result contains a shallow copy of the inputs. Allocate any + additional storage needed in RESULT_POOL. + */ svn_skel_t * svn_wc__wq_merge(svn_skel_t *work_item1, svn_skel_t *work_item2,