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 2013/02/18 13:02:23 UTC
svn commit: r1447207 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Author: stsp
Date: Mon Feb 18 12:02:23 2013
New Revision: 1447207
URL: http://svn.apache.org/r1447207
Log:
* subversion/libsvn_wc/conflicts.c
(resolve_conflicts_on_node): Remove a comment in the docstring that refers
to times when conflict_status_walker() still contained logic to resolve
some conflicts which was moved into resolve_conflicts_on_node in r1443172.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1447207&r1=1447206&r2=1447207&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon Feb 18 12:02:23 2013
@@ -2308,9 +2308,6 @@ svn_wc__read_conflicts(const apr_array_h
### This func combines *resolving* and *marking as resolved* -- seems poor.
- ### Resolving is shared between this func and its caller
- 'conflict_status_walker()' -- seems poor.
-
LOCAL_ABSPATH in DB is the path to the item to be resolved.
RESOLVE_TEXT, RESOLVE_PROPS and RESOLVE_TREE are TRUE iff text, property
and tree conflicts respectively are to be resolved.