svn commit: r1479605 - /subversion/trunk/subversion/svn/conflict-callbacks.c

[ju...@apache.org]

Author: julianfoad
Date: Mon May  6 15:32:18 2013
New Revision: 1479605

URL: http://svn.apache.org/r1479605
Log:
Fix an interactive conflict resolution problem triggered by r1477876.

* subversion/svn/conflict-callbacks.c
  (conflict_func_interactive): Don't assume it's a text conflict
    whenever the node kind is 'file', as that could be a property
    conflict, so check that the conflict kind is 'text'.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1479605&r1=1479604&r2=1479605&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Mon May  6 15:32:18 2013
@@ -1218,7 +1218,7 @@ conflict_func_interactive(svn_wc_conflic
      Conflicting edits on a file's text, or
      Conflicting edits on a property.
   */
-  if (((desc->node_kind == svn_node_file)
+  if (((desc->kind == svn_wc_conflict_kind_text)
        && (desc->action == svn_wc_conflict_action_edit)
        && (desc->reason == svn_wc_conflict_reason_edited)))
     SVN_ERR(handle_text_conflict(*result, desc, b, scratch_pool));