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/01/30 20:09:00 UTC

svn commit: r1440589 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: philip
Date: Wed Jan 30 19:09:00 2013
New Revision: 1440589

URL: http://svn.apache.org/viewvc?rev=1440589&view=rev
Log:
* subversion/libsvn_client/merge.c
  (merge_dir_opened): Remove obstructing variable.

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=1440589&r1=1440588&r2=1440589&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Jan 30 19:09:00 2013
@@ -2508,8 +2508,6 @@ merge_dir_opened(void **new_dir_baton,
 
       /* Check for an obstructed or missing node on disk. */
       {
-        svn_wc_notify_state_t obstr_state;
-
         SVN_ERR(perform_obstruction_check(&obstr_state, &is_deleted, &kind,
                                           merge_b, local_abspath, svn_node_unknown,
                                           scratch_pool));