From commits-return-49113-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Sat Jul 21 15:22:07 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 875E4180634 for ; Sat, 21 Jul 2018 15:22:07 +0200 (CEST) Received: (qmail 50549 invoked by uid 500); 21 Jul 2018 13:22:06 -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 50539 invoked by uid 99); 21 Jul 2018 13:22:06 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Jul 2018 13:22:06 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id F34163A00D1 for ; Sat, 21 Jul 2018 13:22:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1836406 - /subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Date: Sat, 21 Jul 2018 13:22:05 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180721132205.F34163A00D1@svn01-us-west.apache.org> Author: stsp Date: Sat Jul 21 13:22:05 2018 New Revision: 1836406 URL: http://svn.apache.org/viewvc?rev=1836406&view=rev Log: Fix wrong expectations of an XFAIL conflict resolver test. * subversion/tests/libsvn_client/conflict-tests.c (test_cherry_pick_post_move_edit): The cherry-pick merge as run by this test results in a text conflict. Update test expectations accordingly. Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Modified: subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c?rev=1836406&r1=1836405&r2=1836406&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_client/conflicts-test.c Sat Jul 21 13:22:05 2018 @@ -4986,7 +4986,14 @@ test_cherry_pick_post_move_edit(const sv /* And "A1/mu" should have expected contents. */ SVN_ERR(svn_stringbuf_from_file2(&buf, sbox_wc_path(b, "A1/mu"), pool)); - SVN_TEST_STRING_ASSERT(buf->data, "More modified content." APR_EOL_STR); + SVN_TEST_STRING_ASSERT(buf->data, + "<<<<<<< .working" APR_EOL_STR + "This is the file 'mu'." APR_EOL_STR + "||||||| .old" APR_EOL_STR + "Modified content." APR_EOL_STR + "=======" APR_EOL_STR + "More modified content." APR_EOL_STR + ">>>>>>> .new" APR_EOL_STR); return SVN_NO_ERROR; }