From nobody Thu Mar 2 20:37:44 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 4PSNGF3693z3wFJG for ; Thu, 2 Mar 2023 20:37:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSNGF1060z3tWN for ; Thu, 2 Mar 2023 20:37:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x531.google.com with SMTP id i34so2017463eda.7 for ; Thu, 02 Mar 2023 12:37:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; t=1677789475; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ru94uEtyNNc5AqbntBBIUrJZKueW5OyKIKHPQds943o=; b=Ld/EYoac7Kjggl+nWRjFJ2m0Tkh04CyMeSxGfbZHWI5twm7q1/53o8Y1Xi5uEYgpJ7 MGWQGaAwaCaeAUUfNrcm94ZYpxsr0xQgsNa/rNBompTmFL6T4ga4ZZ0svMJCeEesDeYT vIQiXrFLvVmQR965Jvh6r7e2y8Y+XkCwfMSkPZKKJtu1iKW3J33X7s81ypFeT/GX297H 5hp2u9wPp9QfQHoXRtgnTvycjpbIH71ruHZs/c3Mqg8OYxpOYUe5m4aQQmAikbKj6FTY QBeQA6wlPwQpuUFRMKay8x1gF/vUuJKrs5A+19noX8kyxG7/EKjFwmXP3j/n/09x1+kK vCrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677789475; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ru94uEtyNNc5AqbntBBIUrJZKueW5OyKIKHPQds943o=; b=yd7fO1fRIrfRch7iAMG4gR9WUkIQuDTQtDexb2JUZY5/i5j3op/TVhARCE3HTkijjp hDAY9enC1ceHUu1EHdWctCoc9Wk+1R3Uro/9ziLZLILOr/aW/zV72ViI2QwYIP9T67Cr 0PICmdzPOKZO3fIRh3zOPgl9Ql2N1rjQlj0EgAnCR5L95n1X5U15eCazuDrnxPB3YjXF iIGPqvkGscse38BccDCvqWblGeYQuC9s6XhpYroRxFdT9dp0d8n200kepNzrErvCY31R CFXrm3pkW3VzCWAPAhOK/4pMRy0/w5RB0DatDIeqyqZCHN9Ph99fCT5t58EB63cSZ3Df 4+nw== X-Gm-Message-State: AO0yUKWyegkg/xSSyuHsB0dq2GxZCG+LiWOHL1VGKj5aVWPlo8w8o3Lf BY8CFsWfBHr5DgVy6YCRF+So7oKAJDT2m87+4uUd1w== X-Google-Smtp-Source: AK7set+uzdWyoEiM1gzDD/+BAi+Jdmss8HhD97t6YX8knAo07fPp81IN4pAg+1/ezw157WIB737iDcBUDLKbwOLNxFE= X-Received: by 2002:a17:906:f6c8:b0:888:6294:a1fd with SMTP id jo8-20020a170906f6c800b008886294a1fdmr5577627ejb.2.1677789475458; Thu, 02 Mar 2023 12:37:55 -0800 (PST) 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 References: <202303020121.3221LWHh070834@gitrepo.freebsd.org> <20230302192204.YPJ7f%steffen@sdaoden.eu> In-Reply-To: From: Warner Losh Date: Thu, 2 Mar 2023 13:37:44 -0700 Message-ID: Subject: Re: git: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain To: Kyle Evans Cc: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Steffen Nurpmeso Content-Type: multipart/alternative; boundary="000000000000b169a105f5f0cde1" X-Rspamd-Queue-Id: 4PSNGF1060z3tWN X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --000000000000b169a105f5f0cde1 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 2, 2023 at 1:07=E2=80=AFPM Kyle Evans wrot= e: > On Thu, Mar 2, 2023 at 2:02=E2=80=AFPM Steffen Nurpmeso > wrote: > > > > Hello, .. sorry to be back again, and then it is you once more.. > > > > Ed Maste wrote in > > <202303020121.3221LWHh070834@gitrepo.freebsd.org>: > > |The branch main has been updated by emaste: > > | > > |URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dceb5f28ba5fcfa69de7410d2327\ > > |d4a5abf2a421f > > ... > > |commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f > > |Author: Ed Maste > > |AuthorDate: 2022-12-14 17:34:59 +0000 > > |Commit: Ed Maste > > |CommitDate: 2023-03-02 01:20:33 +0000 > > | > > | freebsd-update: re-edit files if merge conflict markers remain > > ... > > |+ if ! egrep -q > '^(<<<<<<<|=3D=3D=3D=3D=3D=3D=3D|>>>>>>>)(\ > > |[[:space:]].*)?$' $(pwd)/merge/new/${F} ; then > > ... > > > > It is because i have written to postfix-users with the subject > > "(GNU) egrep is obsolescent" right before i read your commit: > > > > [... snip ...] > > > > So i thought .. maybe to bring the in-line-with-Linux to an > > extend, a FreeBSD style thing on the use of grep -E, maybe. > > > > I'd really prefer not to be annoying about it until we actually plan > to deprecate it, and I haven't seen a single call for removing it from > FreeBSD. > I doubt egrep will ever be deprecated. Too many scripts depend on it. And fixing this one is a drop in the bucket. I personally think the warning from gnu-grep is bananas... Warner --000000000000b169a105f5f0cde1 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Mar 2, 2023 at 1:07=E2=80=AFP= M Kyle Evans <kevans@freebsd.org> wrote:
On= Thu, Mar 2, 2023 at 2:02=E2=80=AFPM Steffen Nurpmeso <steffen@sdaoden.eu> wrote: >
> Hello, .. sorry to be back again, and then it is you once more..
>
> Ed Maste wrote in
>=C2=A0 <202303020121.3221LWHh070834@gitrepo.freebsd.org>:
>=C2=A0 |The branch main has been updated by emaste:
>=C2=A0 |
>=C2=A0 |URL: https://cgi= t.FreeBSD.org/src/commit/?id=3Dceb5f28ba5fcfa69de7410d2327\
>=C2=A0 |d4a5abf2a421f
>=C2=A0 ...
>=C2=A0 |commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f
>=C2=A0 |Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org><= br> >=C2=A0 |AuthorDate: 2022-12-14 17:34:59 +0000
>=C2=A0 |Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org><= br> >=C2=A0 |CommitDate: 2023-03-02 01:20:33 +0000
>=C2=A0 |
>=C2=A0 |=C2=A0 =C2=A0 freebsd-update: re-edit files if merge conflict m= arkers remain
>=C2=A0 ...
>=C2=A0 |+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if ! egrep -q '^(<<<= <<<<|=3D=3D=3D=3D=3D=3D=3D|>>>>>>>)(\
>=C2=A0 |[[:space:]].*)?$' $(pwd)/merge/new/${F} ; then
>=C2=A0 ...
>
> It is because i have written to postfix-users with the subject
> "(GNU) egrep is obsolescent" right before i read your commit= :
>
> [... snip=C2=A0 ...]
>
> So i thought .. maybe to bring the in-line-with-Linux to an
> extend, a FreeBSD style thing on the use of grep -E, maybe.
>

I'd really prefer not to be annoying about it until we actually plan to deprecate it, and I haven't seen a single call for removing it from<= br> FreeBSD.

I doubt egrep will ever be dep= recated. Too many scripts depend on it.
And fixing this one is a = drop in the bucket. I personally think the warning
from gnu-grep = is bananas...

Warner
--000000000000b169a105f5f0cde1--