Return-Path: Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: (qmail 46926 invoked from network); 26 Mar 2010 18:33:48 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 Mar 2010 18:33:48 -0000 Received: (qmail 27841 invoked by uid 500); 26 Mar 2010 18:33:48 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 27819 invoked by uid 500); 26 Mar 2010 18:33: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 27812 invoked by uid 99); 26 Mar 2010 18:33:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Mar 2010 18:33:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 26 Mar 2010 18:33:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A4AD323888FE; Fri, 26 Mar 2010 18:33:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r928008 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Date: Fri, 26 Mar 2010 18:33:25 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100326183325.A4AD323888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stsp Date: Fri Mar 26 18:33:25 2010 New Revision: 928008 URL: http://svn.apache.org/viewvc?rev=928008&view=rev Log: * subversion/libsvn_wc/wc-metadata.sql (ACTUAL_NODE): Ask a question. Can someone answer it? Thanks. Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=928008&r1=928007&r2=928008&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original) +++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Fri Mar 26 18:33:25 2010 @@ -410,6 +410,10 @@ CREATE TABLE ACTUAL_NODE ( /* Three columns containing the checksums of older, left and right conflict texts. Stored in a column to allow storing them in the pristine store */ + /* stsp: This is meant for text conflicts, right? What about property + conflicts? Why do we need these in a column to refer to the + pristine store? Can't we just parse the checksums from + conflict_data as well? */ older_checksum TEXT, left_checksum TEXT, right_checksum TEXT,