You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2010/03/26 19:33:25 UTC

svn commit: r928008 - /subversion/trunk/subversion/libsvn_wc/wc-metadata.sql

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,