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 89128D7B2 for ; Thu, 31 Jan 2013 21:36:11 +0000 (UTC) Received: (qmail 90545 invoked by uid 500); 31 Jan 2013 21:36:11 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 90521 invoked by uid 500); 31 Jan 2013 21:36:11 -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 90513 invoked by uid 99); 31 Jan 2013 21:36:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jan 2013 21:36:11 +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; Thu, 31 Jan 2013 21:36:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 43E3823889DE; Thu, 31 Jan 2013 21:35:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1441203 - /subversion/trunk/subversion/tests/cmdline/svntest/actions.py Date: Thu, 31 Jan 2013 21:35:50 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130131213550.43E3823889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhuijben Date: Thu Jan 31 21:35:49 2013 New Revision: 1441203 URL: http://svn.apache.org/viewvc?rev=1441203&view=rev Log: * subversion/tests/cmdline/svntest/actions.py (run_and_verify_merge): On differences between output and dry run output print what is compared, not half compared output, half full output. Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1441203&r1=1441202&r2=1441203&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Thu Jan 31 21:35:49 2013 @@ -1132,7 +1132,7 @@ def run_and_verify_merge(dir, rev1, rev2 for x in out_dry: logger.warn(x) logger.warn("The full merge output:") - for x in out: + for x in merge_diff_out: logger.warn(x) logger.warn("=============================================================") raise main.SVNUnmatchedError