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 CB2ABE5DD for ; Wed, 13 Feb 2013 21:23:03 +0000 (UTC) Received: (qmail 57540 invoked by uid 500); 13 Feb 2013 21:23:03 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 57513 invoked by uid 500); 13 Feb 2013 21:23:03 -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 57506 invoked by uid 99); 13 Feb 2013 21:23:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Feb 2013 21:23:03 +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, 13 Feb 2013 21:23:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BCD58238890B; Wed, 13 Feb 2013 21:22:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1445933 - /subversion/trunk/subversion/libsvn_client/merge.c Date: Wed, 13 Feb 2013 21:22:43 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130213212243.BCD58238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: julianfoad Date: Wed Feb 13 21:22:43 2013 New Revision: 1445933 URL: http://svn.apache.org/r1445933 Log: Fix up interactions between conflicts, sleep-for-timestamps, and reporting other errors, following r1445761. * subversion/libsvn_client/merge.c (merge_locked, merge_reintegrate_locked, do_automatic_merge_locked): Use a consistent source code style. (merge_peg_locked): Do things in a correct and consistent order: if there are conflicts we still need to sleep for timestamps and report any 'real' error. 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=1445933&r1=1445932&r2=1445933&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/merge.c (original) +++ subversion/trunk/subversion/libsvn_client/merge.c Wed Feb 13 21:22:43 2013 @@ -10286,9 +10286,7 @@ merge_locked(const char *source1, if (use_sleep) svn_io_sleep_for_timestamps(target->abspath, scratch_pool); - if (err) - return svn_error_trace(err); - + SVN_ERR(err); SVN_ERR(make_merge_conflict_error( conflict_report, target->abspath, scratch_pool)); @@ -10321,8 +10319,7 @@ merge_locked(const char *source1, if (use_sleep) svn_io_sleep_for_timestamps(target->abspath, scratch_pool); - if (err) - return svn_error_trace(err); + SVN_ERR(err); SVN_ERR(make_merge_conflict_error( conflict_report, target->abspath, scratch_pool)); @@ -11481,8 +11478,7 @@ merge_reintegrate_locked(const char *sou if (use_sleep) svn_io_sleep_for_timestamps(target_abspath, scratch_pool); - if (err) - return svn_error_trace(err); + SVN_ERR(err); SVN_ERR(make_merge_conflict_error( conflict_report, target->abspath, scratch_pool)); @@ -11582,16 +11578,18 @@ merge_peg_locked(const char *source_path diff_ignore_ancestry, force_delete, dry_run, record_only, NULL, FALSE, FALSE, depth, merge_options, ctx, sesspool, sesspool); - SVN_ERR(make_merge_conflict_error( - conflict_report, target->abspath, scratch_pool)); + + /* We're done with our RA session. */ + svn_pool_destroy(sesspool); if (use_sleep) svn_io_sleep_for_timestamps(target_abspath, sesspool); - /* We're done with our RA session. */ - svn_pool_destroy(sesspool); + SVN_ERR(err); + SVN_ERR(make_merge_conflict_error( + conflict_report, target->abspath, scratch_pool)); - return svn_error_trace(err); + return SVN_NO_ERROR; } svn_error_t * @@ -12311,7 +12309,6 @@ do_automatic_merge_locked(const svn_clie svn_io_sleep_for_timestamps(target_abspath, scratch_pool); SVN_ERR(err); - SVN_ERR(make_merge_conflict_error( conflict_report, target->abspath, scratch_pool));