svn commit: r927460 - /subversion/trunk/subversion/libsvn_client/export.c

[gs...@apache.org]

Author: gstein
Date: Thu Mar 25 15:57:10 2010
New Revision: 927460

URL: http://svn.apache.org/viewvc?rev=927460&view=rev
Log:
Revert r927412. The real problem lies elsewhere, and this change merely
papered over the resulting symptoms.

* subversion/libsvn_client/export.c:
  (copy_one_versioned_file): retain the source==NULL check

Modified:
    subversion/trunk/subversion/libsvn_client/export.c

Modified: subversion/trunk/subversion/libsvn_client/export.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/export.c?rev=927460&r1=927459&r2=927460&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/export.c (original)
+++ subversion/trunk/subversion/libsvn_client/export.c Thu Mar 25 15:57:10 2010
@@ -157,14 +157,14 @@ copy_one_versioned_file(const char *from
 
          Copied-/moved-here nodes have a base, so export both added and
          replaced files when they involve a copy-/move-here.
-      */
-      if ((entry->schedule == svn_wc_schedule_add
-           || entry->schedule == svn_wc_schedule_replace)
-          && !entry->copied)
-        return SVN_NO_ERROR;
 
+         We get all this for free from evaluating SOURCE == NULL:
+       */
       SVN_ERR(svn_wc_get_pristine_contents2(&source, wc_ctx, from_abspath,
                                             scratch_pool, scratch_pool));
+      if (source == NULL)
+        return SVN_NO_ERROR;
+
       SVN_ERR(svn_wc_get_prop_diffs2(NULL, &props, wc_ctx, from_abspath,
                                      scratch_pool, scratch_pool));
     }