You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2013/05/13 19:52:44 UTC
svn commit: r1481992 - in /subversion/branches/1.8.x-r1477876: ./
subversion/svn/conflict-callbacks.c
Author: julianfoad
Date: Mon May 13 17:52:44 2013
New Revision: 1481992
URL: http://svn.apache.org/r1481992
Log:
On the 1.8.x-r1477876 branch: merge r1479605 from trunk.
Modified:
subversion/branches/1.8.x-r1477876/ (props changed)
subversion/branches/1.8.x-r1477876/subversion/svn/conflict-callbacks.c
Propchange: subversion/branches/1.8.x-r1477876/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1479605
Modified: subversion/branches/1.8.x-r1477876/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1477876/subversion/svn/conflict-callbacks.c?rev=1481992&r1=1481991&r2=1481992&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1477876/subversion/svn/conflict-callbacks.c (original)
+++ subversion/branches/1.8.x-r1477876/subversion/svn/conflict-callbacks.c Mon May 13 17:52:44 2013
@@ -1165,7 +1165,7 @@ svn_cl__conflict_func_interactive(svn_wc
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));