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

[rh...@apache.org]

Author: rhuijben
Date: Mon Apr  4 22:50:40 2011
New Revision: 1088814

URL: http://svn.apache.org/viewvc?rev=1088814&view=rev
Log:
* subversion/libsvn_client/merge.c
  (pre_merge_status_cb): Following up on r1088798, don't see file externals as
    switched.

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=1088814&r1=1088813&r2=1088814&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Apr  4 22:50:40 2011
@@ -5611,18 +5611,17 @@ pre_merge_status_cb(void *baton,
   const char *dup_abspath = NULL;
 
   /* ### Probably needed: Calculate file external status */
-  /*svn_boolean_t is_file_external = FALSE;
+  svn_boolean_t is_file_external = FALSE;
 
   if (status->versioned
       && status->switched
       && status->kind == svn_node_file)
     {
-      svn_boolean_t is_file_external;
       SVN_ERR(svn_wc__node_is_file_external(&is_file_external, pmsb->wc_ctx,
                                             local_abspath, pool));
-    }*/
+    }
 
-  if (status->switched)
+  if (status->switched && !is_file_external)
     {
       if (!dup_abspath)
         dup_abspath = apr_pstrdup(pmsb->pool, local_abspath);