You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by gs...@apache.org on 2010/04/09 08:54:50 UTC

svn commit: r932269 - /subversion/trunk/subversion/libsvn_wc/merge.c

Author: gstein
Date: Fri Apr  9 06:54:50 2010
New Revision: 932269

URL: http://svn.apache.org/viewvc?rev=932269&view=rev
Log:
* subversion/libsvn_wc/merge.c:
  (eval_conflict_func_result): note a bug, with a resulting question

Modified:
    subversion/trunk/subversion/libsvn_wc/merge.c

Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=932269&r1=932268&r2=932269&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Fri Apr  9 06:54:50 2010
@@ -542,6 +542,12 @@ eval_conflict_func_result(enum svn_wc_me
                                          pool));
             }
 
+#if 0
+          /* ### what should this value be? no caller appears to initialize
+             ### it, so we really SHOULD be setting a value here.  */
+          *merge_outcome = svn_wc_merge_merged;
+#endif
+
           /* Assume conflict remains. */
           return SVN_NO_ERROR;
         }