Author: stsp
Date: Thu Jan 29 22:07:33 2015
New Revision: 1655875
URL: http://svn.apache.org/r1655875
Log:
On the pin-externals branch, don't close an editor dir baton too early.
Found by: rhuijben
* subversion/libsvn_client/copy.c
(path_driver_cb_func): If we open a directory here to apply an svn:externals
property change, let the driver close the resulting directory baton. This
allows the driver to traverse further into the directory before closing
it if needed.
Modified:
subversion/branches/pin-externals/subversion/libsvn_client/copy.c
Modified: subversion/branches/pin-externals/subversion/libsvn_client/copy.c
URL:
http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/libsvn_client/copy.c?rev=1655875&r1=1655874&r2=1655875&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/libsvn_client/copy.c (original)
+++ subversion/branches/pin-externals/subversion/libsvn_client/copy.c Thu Jan
29 22:07:33 2015
@@ -985,23 +985,13 @@ path_driver_cb_func(void **dir_baton,
if (path_info->externals)
{
- svn_boolean_t opened_dir = FALSE;
-
if (*dir_baton == NULL)
- {
- SVN_ERR(cb_baton->editor->open_directory(path, parent_baton,
- SVN_INVALID_REVNUM,
- pool, dir_baton));
- opened_dir = TRUE;
- }
+ SVN_ERR(cb_baton->editor->open_directory(path, parent_baton,
+ SVN_INVALID_REVNUM,
+ pool, dir_baton));
SVN_ERR(cb_baton->editor->change_dir_prop(*dir_baton, SVN_PROP_EXTERNALS,
path_info->externals, pool));
- if (opened_dir)
- {
- SVN_ERR(cb_baton->editor->close_directory(*dir_baton, pool));
- *dir_baton = NULL;
- }
}
return SVN_NO_ERROR;
