You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/02/08 23:00:25 UTC
svn commit: r1068601 -
/subversion/trunk/subversion/libsvn_client/commit_util.c
Author: hwright
Date: Tue Feb 8 22:00:24 2011
New Revision: 1068601
URL: http://svn.apache.org/viewvc?rev=1068601&view=rev
Log:
* subversion/libsvn_client/commit_util.c
(bail_on_tree_conflicted_children): Update inaccurate comment.
Modified:
subversion/trunk/subversion/libsvn_client/commit_util.c
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1068601&r1=1068600&r2=1068601&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Tue Feb 8 22:00:24 2011
@@ -242,10 +242,7 @@ add_lock_token(const char *local_abspath
* information in its parent dir is the only indication that the node
* is under version control. This function is necessary for this
* particular case. In all other cases, this simply bails out a little
- * bit earlier.
- *
- * Note: Tree-conflicts info can only be found in "THIS_DIR" entries,
- * where each THIS_DIR will only hold tree-conflicts on its children. */
+ * bit earlier. */
static svn_error_t *
bail_on_tree_conflicted_children(svn_wc_context_t *wc_ctx,
const char *local_abspath,