You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/01/12 00:08:00 UTC
svn commit: r1057915 - /subversion/trunk/subversion/libsvn_client/patch.c
Author: stsp
Date: Tue Jan 11 23:07:59 2011
New Revision: 1057915
URL: http://svn.apache.org/viewvc?rev=1057915&view=rev
Log:
* subversion/libsvn_client/patch.c
(delete_empty_dirs): Notify about deleted directories after deleting them,
not before deleting them.
Modified:
subversion/trunk/subversion/libsvn_client/patch.c
Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=1057915&r1=1057914&r2=1057915&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Tue Jan 11 23:07:59 2011
@@ -2586,6 +2586,11 @@ delete_empty_dirs(apr_array_header_t *ta
SVN_ERR(ctx->cancel_func(ctx->cancel_baton));
empty_dir = svn__apr_hash_index_key(hi);
+ if (! dry_run)
+ SVN_ERR(svn_wc_delete4(ctx->wc_ctx, empty_dir, FALSE, FALSE,
+ ctx->cancel_func, ctx->cancel_baton,
+ NULL, NULL, /* no duplicate notification */
+ iterpool));
if (ctx->notify_func2)
{
svn_wc_notify_t *notify;
@@ -2594,11 +2599,6 @@ delete_empty_dirs(apr_array_header_t *ta
iterpool);
(*ctx->notify_func2)(ctx->notify_baton2, notify, iterpool);
}
- if (! dry_run)
- SVN_ERR(svn_wc_delete4(ctx->wc_ctx, empty_dir, FALSE, FALSE,
- ctx->cancel_func, ctx->cancel_baton,
- NULL, NULL, /* no duplicate notification */
- iterpool));
}
svn_pool_destroy(iterpool);