From nobody Fri Mar 3 02:30:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PSX4s3x52z3wXg3; Fri, 3 Mar 2023 02:30:21 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSX4s386lz3Hhg; Fri, 3 Mar 2023 02:30:21 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677810621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=5ONJR+KvduIYVVsaZ+OL5+biWwsRes3dojk8GHvB7Hs=; b=c1BKlHOyhpmE9zRKlVm4dkeS/AMnKuIp9T6nf5jrKp0Cj+6DOH2EFZnMRnSxL2QtqejyAs C9S+23n6lsjSL63vstXvNo8a1C0/Jx0goNgaPTKevm6xadepKauVZ41cfliDL3Dpx2DZXn Jt4JHvb1+4cM9xXSWsnKKgkz6jSF9rIX9EFzQn/1I1Gy8mRO7JI7+DUNR+sHGkhnpZr/pC I9gA2GwRW1+7FOc9r9MnXy9WIt0KER8u1GSs5s3boQx2B2oLMws2ssW9n1RC2kjL5UPA36 Zx4iL0xpSTeQ7Pqr30r32yy6hJ04IyIvW/bNMcT7E4UA36/uh7sTcTh1EUnQaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677810621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=5ONJR+KvduIYVVsaZ+OL5+biWwsRes3dojk8GHvB7Hs=; b=DErs7scfiqobKF+QRxLly3Rc5mHflD0CpzCwJggz9aLhXe2h76XMP5Z4m6KRJHLc5GLqRA 6hBPvXNBngoPyoDlFQO07SOsrmgN0inPkhUmHgopcprn8Jfz18rvSmss43USzQNx5H+4c/ hWP4rUJ6rfH+o6BfpfLi3ZVOHDL2m7EimT68PTY6AayBI1RRHBc1VxwAf3q3A6LlKDIf5p ICEkr8xxrZ62VuS8h5IAgl2cT9cFgkeWl7/JBsFlT+IfQJSNClwqd5ZiSSBJbvQbtJtzAG Tj9Lgz+mAK2y06hySh5wko+GQ7snuqmgsbutej+QxM/G3QvxZ7ZvDuGKLbY25w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677810621; a=rsa-sha256; cv=none; b=bvAKw37+xEEWUCvRiXhLrnq7BHEPrKbNNY6TSu86t6gXqxRSzx4pj+AlsBW9aqXkhlsbtH RVXUekqRKm6DaTCRDsx9UoLdchHToPjcr4TbZtZLaAfk81uYAr1UiZUXlLZMP3fcN+9ku7 r0GYQP3Aw+QIUKHz6qRJUDlC4Qxc344G3WvMuim3Ws/+bDRi0eov02FhCZsAIUpBYWH5kB JYoFgrdzIo4GVcwKV6Ce79H7X3Hmvv1Y2dg1RRDAkxM4MKbiHAwjWegFbEknN9tnI6cjP0 GIdvdaqGhULHSsDPpd5LAkD+j0fb05mVdXHfb3QpC89b8rHzsTsjJDTjSdUz9g== Received: by freefall.freebsd.org (Postfix, from userid 1033) id 492F3FA9C; Fri, 3 Mar 2023 02:30:21 +0000 (UTC) Date: Fri, 3 Mar 2023 02:30:21 +0000 From: Alexey Dokuchaev To: Warner Losh Cc: Kyle Evans , Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Steffen Nurpmeso Subject: Re: git: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain Message-ID: References: <202303020121.3221LWHh070834@gitrepo.freebsd.org> <20230302192204.YPJ7f%steffen@sdaoden.eu> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-ThisMailContainsUnwantedMimeParts: N On Thu, Mar 02, 2023 at 01:37:44PM -0700, Warner Losh wrote: > ... > I doubt egrep will ever be deprecated. Too many scripts depend on it. Oh come on, it's somewhat ironic to hear that from you Warner who apparently loves to deprecated things. :-) Seriously though, [ef]grep should go. Installing what should be one's shell aliases as first-class programs always seemed dubious to me. Admittedly, I welcome GNU grep guys' rather unpopular* decision to help the world clean up those scripts. > warning from gnu-grep is bananas... As any deprecation warning, it can be annoying, but how else would you nudge people to fix their scripts? ./danfe *) https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269840