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 2012/02/07 17:45:21 UTC
svn commit: r1241516 -
/subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c
Author: stsp
Date: Tue Feb 7 16:45:20 2012
New Revision: 1241516
URL: http://svn.apache.org/viewvc?rev=1241516&view=rev
Log:
On the moves-scan-log branch:
* subversion/libsvn_wc/update_editor.c
(delete_entry): Use more obvious conditions when testing for the
'local moved away, incoming delete' tree-conflict case.
Modified:
subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c
Modified: subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c?rev=1241516&r1=1241515&r2=1241516&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c Tue Feb 7 16:45:20 2012
@@ -2219,7 +2219,7 @@ delete_entry(const char *path,
break;
}
- if (moved_to_abspath &&
+ if (tree_conflict->reason == svn_wc_conflict_reason_moved_away &&
result->choice == svn_wc_conflict_choose_delete_is_delete)
{
svn_boolean_t all_edits_are_deletes = FALSE;