Author: rhuijben
Date: Thu Feb 21 08:50:25 2013
New Revision: 1448549
URL: http://svn.apache.org/r1448549
Log:
* subversion/libsvn_wc/conflicts.c
(resolve_prop_conflict_on_node): Extend comment.
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=1448549&r1=1448548&r2=1448549&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Thu Feb 21 08:50:25 2013
@@ -2497,6 +2497,8 @@ resolve_text_conflict_on_node(svn_boolea
* each property, selecting hunks. Or all three kinds of behaviour
* should be available (full set of props, full value of conflicting
* props, or conflicting text hunks).
+ * ### BH: If we make *_full select the full set of properties, we should
+ * check if we shouldn't make it also select the full text for files.
*
* ### TODO [JAF] All this complexity should not be down here in libsvn_wc
* but in a layer above.
