Author: hwright
Date: Mon Oct 25 20:47:37 2010
New Revision: 1027264
URL: http://svn.apache.org/viewvc?rev=1027264&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
(resolve_conflict_on_node): Add a question.
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=1027264&r1=1027263&r2=1027264&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon Oct 25 20:47:37 2010
@@ -166,6 +166,8 @@ attempt_deletion(const char *parent_dir,
### leave, for example, one of the conflict artifact files deleted but
### the entry still referring to it and trying to use it for the next
### attempt at resolving.
+
+ ### Does this still apply in the world of WC-NG? -hkw
*/
static svn_error_t *
resolve_conflict_on_node(svn_wc__db_t *db,
