svn commit: r1089766 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_wc/wc-metadata.sql

[ph...@apache.org]

Author: philip
Date: Thu Apr  7 08:17:29 2011
New Revision: 1089766

URL: http://svn.apache.org/viewvc?rev=1089766&view=rev
Log:
Tweak some comments after the WC format bump of r1089593.

* subversion/include/svn_wc.h
  (struct svn_wc_conflict_description2_t): Tweak comment.

* subversion/libsvn_wc/wc-metadata.sql
  (ACTUAL_NODE): Tweak comment.

Modified:
    subversion/trunk/subversion/include/svn_wc.h
    subversion/trunk/subversion/libsvn_wc/wc-metadata.sql

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1089766&r1=1089765&r2=1089766&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Thu Apr  7 08:17:29 2011
@@ -1666,9 +1666,10 @@ typedef struct svn_wc_conflict_descripti
    * four fulltext files that can be used to interactively resolve the
    * conflict.
    *
-   * BASE_ABSPATH, THEIR_ABSPATH and MY_ABSPATH are absolute paths.
+   * @a base_abspath, @a their_abspath and @a my_abspath are absolute
+   * paths.
    *
-   * ### Is MERGED_FILE relative to some directory, or absolute?
+   * ### Is @a merged_file relative to some directory, or absolute?
    *
    * All four files will be in repository-normal form -- LF
    * line endings and contracted keywords.  (If any of these files are

Modified: subversion/trunk/subversion/libsvn_wc/wc-metadata.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc-metadata.sql?rev=1089766&r1=1089765&r2=1089766&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc-metadata.sql (original)
+++ subversion/trunk/subversion/libsvn_wc/wc-metadata.sql Thu Apr  7 08:17:29 2011
@@ -141,12 +141,12 @@ CREATE TABLE ACTUAL_NODE (
      the properties, relative to WORKING/BASE as appropriate. */
   properties  BLOB,
 
-  /* basenames of the conflict files. */
+  /* relpaths of the conflict files. */
   /* ### These columns will eventually be merged into conflict_data below. */
   conflict_old  TEXT,
   conflict_new  TEXT,
   conflict_working  TEXT,
-  prop_reject  TEXT,  /* ### is this right? */
+  prop_reject  TEXT,
 
   /* if not NULL, this node is part of a changelist. */
   changelist  TEXT,