Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r928009 -
 /subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
Date: Fri, 26 Mar 2010 18:37:34 -0000
To: commits@subversion.apache.org
From: stsp@apache.org
Message-Id: <20100326183734.B6E0023888FD@eris.apache.org>

Author: stsp
Date: Fri Mar 26 18:37:34 2010
New Revision: 928009

URL: http://svn.apache.org/viewvc?rev=928009&view=rev
Log:
* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__deserialize_conflict): Fix the docstring. It still referred
   to stuff from way back when tree conflict data wasn't stored in skels.

Modified:
    subversion/trunk/subversion/libsvn_wc/tree_conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflicts.c?rev=928009&r1=928008&r2=928009&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Fri Mar 26 18:37:34 2010
@@ -218,11 +218,9 @@ read_node_version_info(const svn_wc_conf
 }
 
 /* Parse a newly allocated svn_wc_conflict_description2_t object from the
- * character string pointed to by *START. Return the result in *CONFLICT.
- * Don't read further than END. Set *START to point to the next character
- * after the description that was read.
+ * provided SKEL. Return the result in *CONFLICT, allocated in RESULT_POOL.
  * DIR_PATH is the path to the WC directory whose conflicts are being read.
- * Do all allocations in pool.
+ * Use SCRATCH_POOL for temporary allocations.
  */
 svn_error_t *
 svn_wc__deserialize_conflict(const svn_wc_conflict_description2_t **conflict,