Author: stsp Date: Thu Sep 27 11:38:18 2012 New Revision: 1390948 URL: http://svn.apache.org/viewvc?rev=1390948&view=rev Log: * subversion/libsvn_wc/update_editor.c (check_tree_conflict): Flag "incoming edit vs. local moved-away" conflicts as such, rather than flagging them as "incoming edit vs. local delete" like Subversion 1.7 did.
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1390948&r1=1390947&r2=1390948&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original) +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Sep 27 11:38:18 2012 @@ -1404,7 +1404,18 @@ check_tree_conflict(svn_skel_t **pconfli case svn_wc__db_status_deleted: - reason = svn_wc_conflict_reason_deleted; + { + const char *moved_to_abspath; + + SVN_ERR(svn_wc__db_scan_deletion(NULL, &moved_to_abspath, + NULL, NULL, eb->db, + local_abspath, + scratch_pool, scratch_pool)); + if (moved_to_abspath) + reason = svn_wc_conflict_reason_moved_away; + else + reason = svn_wc_conflict_reason_deleted; + } break; case svn_wc__db_status_incomplete: