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

Posted to commits@subversion.apache.org by ph...@apache.org on 2015/02/13 11:55:10 UTC

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

Author: philip
Date: Fri Feb 13 10:55:10 2015
New Revision: 1659503

URL: http://svn.apache.org/r1659503
Log:
* subversion/libsvn_wc/conflicts.c
  (read_tree_conflict_desc): Compare reason to svn_wc_conflict_reason_t.

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=1659503&r1=1659502&r2=1659503&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Feb 13 10:55:10 2015
@@ -1797,7 +1797,7 @@ read_tree_conflict_desc(svn_wc_conflict_
            && left_version
            && (operation == svn_wc_operation_update
                ||operation == svn_wc_operation_switch)
-           && (reason == svn_wc_conflict_action_delete
+           && (reason == svn_wc_conflict_reason_deleted
                || reason == svn_wc_conflict_reason_moved_away))
     {
       /* We have nothing locally to take the kind from */