Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6B72DE5BE for ; Wed, 6 Feb 2013 15:59:09 +0000 (UTC) Received: (qmail 52953 invoked by uid 500); 6 Feb 2013 15:59:09 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 52846 invoked by uid 500); 6 Feb 2013 15:59:09 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 52826 invoked by uid 99); 6 Feb 2013 15:59:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Feb 2013 15:59:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Feb 2013 15:59:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DED9A23889EB; Wed, 6 Feb 2013 15:58:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1443035 - /subversion/trunk/subversion/libsvn_client/merge.c Date: Wed, 06 Feb 2013 15:58:48 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130206155848.DED9A23889EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhuijben Date: Wed Feb 6 15:58:48 2013 New Revision: 1443035 URL: http://svn.apache.org/viewvc?rev=1443035&view=rev Log: * subversion/libsvn_client/merge.c (drive_merge_report_editor): Following up on r1443032, remove the other unneeded setter of use_sleep. Modified: subversion/trunk/subversion/libsvn_client/merge.c Modified: subversion/trunk/subversion/libsvn_client/merge.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1443035&r1=1443034&r2=1443035&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/merge.c (original) +++ subversion/trunk/subversion/libsvn_client/merge.c Wed Feb 6 15:58:48 2013 @@ -5459,9 +5459,6 @@ drive_merge_report_editor(const char *ta SVN_ERR(svn_ra_reparent(merge_b->ra_session1, old_sess1_url, scratch_pool)); SVN_ERR(svn_ra_reparent(merge_b->ra_session2, old_sess2_url, scratch_pool)); - /* Caller must call svn_sleep_for_timestamps() */ - *(merge_b->use_sleep) = TRUE; - return SVN_NO_ERROR; }