From owner-svn-src-stable@freebsd.org Sun Jun 28 02:29:54 2020 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 33D9033C930; Sun, 28 Jun 2020 02:29:54 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49vZMk0f3Wz3WZQ; Sun, 28 Jun 2020 02:29:54 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 116FBF4D8; Sun, 28 Jun 2020 02:29:54 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05S2Tr5k021198; Sun, 28 Jun 2020 02:29:53 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05S2Trgn021197; Sun, 28 Jun 2020 02:29:53 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202006280229.05S2Trgn021197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sun, 28 Jun 2020 02:29:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r362714 - stable/12/usr.bin/sed/tests X-SVN-Group: stable-12 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: stable/12/usr.bin/sed/tests X-SVN-Commit-Revision: 362714 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Jun 2020 02:29:54 -0000 Author: kevans Date: Sun Jun 28 02:29:53 2020 New Revision: 362714 URL: https://svnweb.freebsd.org/changeset/base/362714 Log: Fix mismerge from r362687 Hex substitutions and the corresponding test case have not yet been merged back to this branch, but a mismerge added in the atf_add_test_case. Back out that line, it'll get re-added with the test shortly. Modified: stable/12/usr.bin/sed/tests/sed2_test.sh Modified: stable/12/usr.bin/sed/tests/sed2_test.sh ============================================================================== --- stable/12/usr.bin/sed/tests/sed2_test.sh Sun Jun 28 01:29:14 2020 (r362713) +++ stable/12/usr.bin/sed/tests/sed2_test.sh Sun Jun 28 02:29:53 2020 (r362714) @@ -113,5 +113,4 @@ atf_init_test_cases() atf_add_test_case inplace_symlink_src atf_add_test_case escape_subst atf_add_test_case commands_on_stdin - atf_add_test_case hex_subst }