Author: stsp
Date: Mon Jan 7 17:12:17 2013
New Revision: 1429902
URL: http://svn.apache.org/viewvc?rev=1429902&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
(setup_tree_conflict_desc): Ask question in 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=1429902&r1=1429901&r2=1429902&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon Jan 7 17:12:17 2013
@@ -1800,6 +1800,9 @@ setup_tree_conflict_desc(svn_wc_conflict
/* With an update or switch we have to fetch the second location
for a tree conflict from WORKING. (For text or prop from BASE)
+
+ ### stsp: The code below doesn't seem to agree with this comment.
+ ### Do we want to get info from BASE or WORKING?
*/
err = svn_wc__db_base_get_info(&status, &kind, &revision,
&repos_relpath, &repos_root_url,
