svn commit: r954530 - /subversion/trunk/subversion/libsvn_wc/update_editor.c

[ju...@apache.org]

Author: julianfoad
Date: Mon Jun 14 16:03:29 2010
New Revision: 954530

URL: http://svn.apache.org/viewvc?rev=954530&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
  (merge_file): Remove a redundant initialization - the variable is
    initialized again on the next line.

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=954530&r1=954529&r2=954530&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Mon Jun 14 16:03:29 2010
@@ -4369,7 +4369,7 @@ merge_file(svn_skel_t **work_items,
         }
       else   /* working file or obstruction is locally modified... */
         {
-          svn_node_kind_t wfile_kind = svn_node_unknown;
+          svn_node_kind_t wfile_kind;
 
           SVN_ERR(svn_io_check_path(fb->local_abspath, &wfile_kind, pool));
           if (wfile_kind == svn_node_none && ! fb->added_with_history)