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 F2D54D310 for ; Thu, 14 Feb 2013 18:13:53 +0000 (UTC) Received: (qmail 22589 invoked by uid 500); 14 Feb 2013 18:13:53 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 22530 invoked by uid 500); 14 Feb 2013 18:13:53 -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 22507 invoked by uid 99); 14 Feb 2013 18:13:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Feb 2013 18:13:53 +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, 14 Feb 2013 18:13:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AED3623889B3; Thu, 14 Feb 2013 18:13:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1446288 - /subversion/trunk/subversion/tests/cmdline/diff_tests.py Date: Thu, 14 Feb 2013 18:13:29 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130214181329.AED3623889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhuijben Date: Thu Feb 14 18:13:29 2013 New Revision: 1446288 URL: http://svn.apache.org/r1446288 Log: * subversion/tests/cmdline/diff_tests.py (local_tree_replace): Following up on r1446279, update expected result. (or commit file missing from original commit) Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1446288&r1=1446287&r2=1446288&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Thu Feb 14 18:13:29 2013 @@ -4311,15 +4311,6 @@ def local_tree_replace(sbox): svntest.actions.run_and_verify_svn(None, None, [], 'add', sbox.ospath('A/B')) - # By default we ignore ancestry, so there are no differences against r1 - expected_output = [] - svntest.actions.run_and_verify_svn(None, expected_output, [], - 'diff', wc_dir, - '-r', '2', - '--show-copies-as-adds') - # Note that 'svn diff' without revision diffs against pristine, which would - # would show differences! - # And now check with ancestry line = '===================================================================\n'