Author: stsp
Date: Fri Aug 22 10:19:27 2014
New Revision: 1619731
URL: http://svn.apache.org/r1619731
Log:
* subversion/libsvn_wc/conflicts.c
(read_tree_conflict_desc): Add a ### 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=1619731&r1=1619730&r2=1619731&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Aug 22 10:19:27 2014
@@ -1813,6 +1813,15 @@ read_tree_conflict_desc(svn_wc_conflict_
SVN_ERR(svn_io_check_path(local_abspath, &local_kind, scratch_pool));
else if (operation == svn_wc_operation_merge)
{
+ /* ### If the merge replaced the node, this will read the kind of
+ * ### the merge-right node, which is not necessarily the node
+ * ### kind of the tree conflict victim.
+ * ### This needs the BASE node kind if the node was not replaced
+ * ### at the time the merge was run. But if the node was already
+ * ### replaced before the merge, it needs the kind of the replacing
+ * ### node. Ideally, we'd store the victim node kind in conflict
+ * ### storage instead of guessing it here...
+ */
/* Read the tree conflict victim's node kind from the working copy,
or if it doesn't exist directly from disk. */
SVN_ERR(svn_wc__db_read_kind(&local_kind, db, local_abspath,
