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 DE56DDFE8 for ; Tue, 5 Mar 2013 12:28:20 +0000 (UTC) Received: (qmail 9443 invoked by uid 500); 5 Mar 2013 12:28:20 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 9219 invoked by uid 500); 5 Mar 2013 12:28:15 -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 9140 invoked by uid 99); 5 Mar 2013 12:28:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Mar 2013 12:28:12 +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 Mar 2013 12:28:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2928D23889CB; Tue, 5 Mar 2013 12:27:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1452766 - /subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Date: Tue, 05 Mar 2013 12:27:52 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130305122752.2928D23889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: philip Date: Tue Mar 5 12:27:51 2013 New Revision: 1452766 URL: http://svn.apache.org/r1452766 Log: * subversion/tests/libsvn_wc/op-depth-test.c (move_away_delete_update): No need for resolve, only update is necessary. 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=1452766&r1=1452765&r2=1452766&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Tue Mar 5 12:27:51 2013 @@ -6749,12 +6749,10 @@ move_away_delete_update(const svn_test_o SVN_ERR(sbox_wc_update(&b, "", 1)); SVN_ERR(sbox_wc_move(&b, "A/B/C", "C2")); SVN_ERR(sbox_wc_move(&b, "P/Q", "Q2")); + + /* Update to r2 removes the move sources and clears moved_here from + the move destinations. */ SVN_ERR(sbox_wc_update(&b, "", 2)); - SVN_ERR(sbox_wc_resolve(&b, "A/B", svn_depth_empty, - svn_wc_conflict_choose_merged)); - SVN_ERR(sbox_wc_resolve(&b, "P/Q", svn_depth_empty, - svn_wc_conflict_choose_merged)); - /* Either update or resolve should clear the moved-here flags */ { nodes_row_t nodes[] = { {0, "", "normal", 2, ""},