Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org, commits@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r906061 -
 /subversion/trunk/subversion/libsvn_client/patch.c
Date: Wed, 03 Feb 2010 14:19:56 -0000
To: commits@subversion.apache.org
From: stsp@apache.org
Message-Id: <20100203141956.220F723888EC@eris.apache.org>

Author: stsp
Date: Wed Feb  3 14:19:55 2010
New Revision: 906061

URL: http://svn.apache.org/viewvc?rev=906061&view=rev
Log:
* subversion/libsvn_client/patch.c
  (install_patched_target): Suppress cancellation while deleting files.
   The 2 main loops of the patch process already allow cancellation
   at sane spots.

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=906061&r1=906060&r2=906061&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Wed Feb  3 14:19:55 2010
@@ -1147,11 +1147,11 @@
       if (! dry_run)
         {
           /* Schedule the target for deletion.  Suppress
-           * notification, we'll do it manually in a minute. */
+           * notification, we'll do it manually in a minute.
+           * Also suppress cancellation. */
           SVN_ERR(svn_wc_delete4(ctx->wc_ctx, target->abs_path,
                                  FALSE /* keep_local */, FALSE,
-                                 ctx->cancel_func, ctx->cancel_baton,
-                                 NULL, NULL, pool));
+                                 NULL, NULL, NULL, NULL, pool));
         }
     }
   else