Author: hwright Date: Wed Oct 12 18:01:39 2011 New Revision: 1182496 URL: http://svn.apache.org/viewvc?rev=1182496&view=rev Log: * subversion/libsvn_client/merge.c (merge_file_changed): Reduce variable scope.
Found by: Philipp Kloke <[email protected]> Modified: subversion/trunk/subversion/libsvn_client/merge.c Modified: subversion/trunk/subversion/libsvn_client/merge.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1182496&r1=1182495&r2=1182496&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/merge.c (original) +++ subversion/trunk/subversion/libsvn_client/merge.c Wed Oct 12 18:01:39 2011 @@ -1463,7 +1463,6 @@ merge_file_changed(svn_wc_notify_state_t if (wc_kind != svn_node_file || is_deleted) { const char *moved_to_abspath; - svn_wc_conflict_reason_t reason; svn_error_t *err; /* Maybe the node is excluded via depth filtering? */ @@ -1513,6 +1512,8 @@ merge_file_changed(svn_wc_notify_state_t } else { + svn_wc_conflict_reason_t reason; + if (is_deleted) reason = svn_wc_conflict_reason_deleted; else
