[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [patch] applying patch can fail with dry_run

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Thu, 12 Jan 2012 19:07:14 +0000

Stefan Küng <tortoisesvn_at_gmail.com> writes:

> Could someone please review my patch? I'm sure you guys can see
> immediately whether this is save or not. If it's ok, then I'll commit
> it later.

Index: subversion/libsvn_client/patch.c
===================================================================
--- subversion/libsvn_client/patch.c (Revision 1230694)
+++ subversion/libsvn_client/patch.c (Arbeitskopie)
@@ -2920,8 +2920,9 @@
     }
   while (patch);
 
- /* Delete directories which are empty after patching, if any. */
- SVN_ERR(delete_empty_dirs(targets_info, ctx, dry_run, scratch_pool));
+ if (!dry_run)
+ /* Delete directories which are empty after patching, if any. */
+ SVN_ERR(delete_empty_dirs(targets_info, ctx, dry_run, scratch_pool));
 
   SVN_ERR(svn_diff_close_patch_file(patch_file, iterpool));
   svn_pool_destroy(iterpool);

It doesn't look right to me. Use dry_run to in two places, to determine
whether to call delete_empty_dirs and as a parameter to
delete_empty_dirs isn't sensible.

-- 
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com
Received on 2012-01-12 20:07:52 CET

This is an archived mail posted to the Subversion Dev mailing list.