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

Posted to commits@subversion.apache.org by st...@apache.org on 2016/02/16 13:42:54 UTC

svn commit: r1730677 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

Author: stsp
Date: Tue Feb 16 12:42:53 2016
New Revision: 1730677

URL: http://svn.apache.org/viewvc?rev=1730677&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (resolve_tree_conflict_on_node): Update comment which referred to a function
   that doesn't exist.

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=1730677&r1=1730676&r2=1730677&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Tue Feb 16 12:42:53 2016
@@ -2723,7 +2723,7 @@ resolve_tree_conflict_on_node(svn_boolea
               if (!new_conflicts || !tree_conflicted)
                 {
                   /* TC is marked resolved by calling
-                     svn_wc__db_resolve_delete_raise_moved_away */
+                     svn_wc__db_op_raise_moved_away */
                   *did_resolve = TRUE;
                   return SVN_NO_ERROR;
                 }