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 1B092E554 for ; Tue, 5 Feb 2013 20:11:14 +0000 (UTC) Received: (qmail 43476 invoked by uid 500); 5 Feb 2013 20:11:14 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 43452 invoked by uid 500); 5 Feb 2013 20:11:14 -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 43436 invoked by uid 99); 5 Feb 2013 20:11:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2013 20:11:13 +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; Tue, 05 Feb 2013 20:10:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D9C2523889CB; Tue, 5 Feb 2013 20:10:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1442720 - /subversion/trunk/subversion/tests/cmdline/svntest/main.py Date: Tue, 05 Feb 2013 20:10:06 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130205201006.D9C2523889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: julianfoad Date: Tue Feb 5 20:10:06 2013 New Revision: 1442720 URL: http://svn.apache.org/viewvc?rev=1442720&view=rev Log: * subversion/tests/cmdline/svntest/main.py (summary_of_conflicts): Notice the new 'skipped_paths' parameter. A follow-up to r1442705. Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1442720&r1=1442719&r2=1442720&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Tue Feb 5 20:10:06 2013 @@ -1193,7 +1193,7 @@ def summary_of_conflicts(text_conflicts= parameters are zero, return an empty list. """ lines = [] - if text_conflicts or prop_conflicts or tree_conflicts: + if text_conflicts or prop_conflicts or tree_conflicts or skipped_paths: lines.append("Summary of conflicts:\n") if text_conflicts: lines.append(" Text conflicts: %d\n" % text_conflicts)