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 2013/03/14 11:14:47 UTC
svn commit: r1456384 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: philip
Date: Thu Mar 14 10:14:47 2013
New Revision: 1456384
URL: http://svn.apache.org/r1456384
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(update_working_file): Remove redundant code.
Found by: julianfoad
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1456384&r1=1456383&r2=1456384&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Thu Mar 14 10:14:47 2013
@@ -964,20 +964,9 @@ update_working_file(const char *local_re
work_items = svn_wc__wq_merge(work_items, work_item, scratch_pool);
if (merge_outcome == svn_wc_merge_conflict)
- {
- content_state = svn_wc_notify_state_conflicted;
- }
+ content_state = svn_wc_notify_state_conflicted;
else
- {
- SVN_ERR(svn_wc__internal_file_modified_p(&is_locally_modified,
- db, local_abspath,
- FALSE /* exact_comparison */,
- scratch_pool));
- if (is_locally_modified)
- content_state = svn_wc_notify_state_merged;
- else
- content_state = svn_wc_notify_state_changed;
- }
+ content_state = svn_wc_notify_state_merged;
}
}
else