Author: rhuijben
Date: Thu Apr 14 13:51:03 2011
New Revision: 1092239
URL: http://svn.apache.org/viewvc?rev=1092239&view=rev
Log:
* subversion/libsvn_client/export.c
(copy_versioned_files): Use svn_wc__node_get_copyfrom_info() to find
out if a node has a history.
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=1092239&r1=1092238&r2=1092239&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/export.c (original)
+++ subversion/trunk/subversion/libsvn_client/export.c Thu Apr 14 13:51:03 2011
@@ -432,18 +432,15 @@ copy_versioned_files(const char *from_ab
if (revision->kind != svn_opt_revision_working)
{
svn_boolean_t is_added;
+ const char *repos_relpath;
- SVN_ERR(svn_wc__node_is_added(&is_added, ctx->wc_ctx,
- from_abspath, pool));
- if (is_added)
- {
- const char *is_copied;
- SVN_ERR(svn_wc__node_get_copyfrom_info(&is_copied, NULL, NULL,
- NULL, NULL, ctx->wc_ctx,
- from_abspath, pool, pool));
- if (! is_copied)
- return SVN_NO_ERROR;
- }
+ SVN_ERR(svn_wc__node_get_origin(&is_added, NULL, &repos_relpath,
+ NULL, NULL,
+ ctx->wc_ctx, from_abspath, FALSE,
+ pool, pool));
+
+ if (is_added && !repos_relpath)
+ return SVN_NO_ERROR; /* Local addition */
}
else
{
