From 41a48a0a1803245a188068c5200383b9543c25b2 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Tue, 27 May 2014 04:55:31 +0000 Subject: Vendor import svn-1.8.9 --- subversion/libsvn_client/export.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'subversion/libsvn_client/export.c') 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; } + -- cgit v1.2.3