Return-Path: Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: (qmail 61031 invoked from network); 7 Apr 2011 13:37:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Apr 2011 13:37:56 -0000 Received: (qmail 9599 invoked by uid 500); 7 Apr 2011 13:37:56 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 9574 invoked by uid 500); 7 Apr 2011 13:37:56 -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 9567 invoked by uid 99); 7 Apr 2011 13:37:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Apr 2011 13:37:56 +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, 07 Apr 2011 13:37:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3ED1723888FD; Thu, 7 Apr 2011 13:37:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1089877 - /subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Date: Thu, 07 Apr 2011 13:37:33 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110407133733.3ED1723888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: philip Date: Thu Apr 7 13:37:32 2011 New Revision: 1089877 URL: http://svn.apache.org/viewvc?rev=1089877&view=rev Log: * subversion/tests/libsvn_wc/op-depth-test.c (test_mixed_rev_copy): Extend to cover not-present source. (test_list): Mark test_mixed_rev_copy XFAIL. Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1089877&r1=1089876&r2=1089877&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Thu Apr 7 13:37:32 2011 @@ -1733,6 +1733,31 @@ test_mixed_rev_copy(const svn_test_opts_ SVN_ERR(check_db_rows(&b, "X", rows)); } + SVN_ERR(wc_delete(&b, "X")); + SVN_ERR(wc_update(&b, "A/B/C", 0)); + { + nodes_row_t rows[] = { + { 0, "", "normal", 0, "" }, + { 0, "A", "normal", 1, "A" }, + { 0, "A/B", "normal", 2, "A/B" }, + { 0, "A/B/C", "not-present", 3, "A/B/C" }, + { 0 } + }; + SVN_ERR(check_db_rows(&b, "", rows)); + } + + SVN_ERR(wc_copy(&b, "A", "X")); + { + nodes_row_t rows[] = { + { 1, "X", "normal", 1, "A" }, + { 1, "X/B", "not-present", 2, "A/B" }, + { 2, "X/B", "normal", 2, "A/B" }, + { 2, "X/B/C", "not-present", 3, "A/B/C" }, + { 0 } + }; + SVN_ERR(check_db_rows(&b, "X", rows)); + } + return SVN_NO_ERROR; } @@ -2763,8 +2788,8 @@ struct svn_test_descriptor_t test_funcs[ "test_temp_op_make_copy"), SVN_TEST_OPTS_PASS(test_wc_move, "test_wc_move"), - SVN_TEST_OPTS_PASS(test_mixed_rev_copy, - "test_mixed_rev_copy"), + SVN_TEST_OPTS_XFAIL(test_mixed_rev_copy, + "test_mixed_rev_copy"), SVN_TEST_OPTS_PASS(test_delete_of_replace, "test_delete_of_replace"), SVN_TEST_OPTS_PASS(test_del_replace_not_present,