aboutsummaryrefslogtreecommitdiffstats
path: root/subversion/libsvn_client/export.c
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2014-05-27 04:55:31 +0000
committerPeter Wemm <peter@FreeBSD.org>2014-05-27 04:55:31 +0000
commit41a48a0a1803245a188068c5200383b9543c25b2 (patch)
tree6d1265a766b5c11e4c2414a994dbabb861526c73 /subversion/libsvn_client/export.c
parent219f5ebf8fca3572d8d4265d78d0e4670ca35a27 (diff)
downloadsrc-41a48a0a1803245a188068c5200383b9543c25b2.tar.gz
src-41a48a0a1803245a188068c5200383b9543c25b2.zip
Vendor import svn-1.8.9vendor/subversion/subversion-1.8.9
Notes
Notes: svn path=/vendor/subversion/dist/; revision=266729 svn path=/vendor/subversion/subversion-1.8.9/; revision=266730; tag=vendor/subversion/subversion-1.8.9
Diffstat (limited to 'subversion/libsvn_client/export.c')
-rw-r--r--subversion/libsvn_client/export.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/subversion/libsvn_client/export.c b/subversion/libsvn_client/export.c
index d6022ed68f29..c14a5f0bc017 100644
--- a/subversion/libsvn_client/export.c
+++ b/subversion/libsvn_client/export.c
@@ -267,7 +267,9 @@ export_node(void *baton,
scratch_pool));
}
- if (status->file_external)
+ /* Skip file externals if they are a descendant of the export,
+ BUT NOT if we are explictly exporting the file external. */
+ if (status->file_external && strcmp(eib->origin_abspath, local_abspath) != 0)
return SVN_NO_ERROR;
/* Produce overwrite errors for the export root */
@@ -1587,3 +1589,4 @@ svn_client_export5(svn_revnum_t *result_rev,
return SVN_NO_ERROR;
}
+