Date: Thu, 2 Mar 2023 13:37:44 -0700 From: Warner Losh <imp@bsdimp.com> To: Kyle Evans <kevans@freebsd.org> Cc: Ed Maste <emaste@freebsd.org>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Steffen Nurpmeso <steffen@sdaoden.eu> Subject: Re: git: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain Message-ID: <CANCZdfpW0iv_sO5ae8qUED-FWY-Lt0WM5_DAtouzS_-n-Cun_Q@mail.gmail.com> In-Reply-To: <CACNAnaGpBNEWbmrkFQ1zpYn%2BfxvyduPoN2ymm7H56qGi3pHTCQ@mail.gmail.com> References: <202303020121.3221LWHh070834@gitrepo.freebsd.org> <20230302192204.YPJ7f%steffen@sdaoden.eu> <CACNAnaGpBNEWbmrkFQ1zpYn%2BfxvyduPoN2ymm7H56qGi3pHTCQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Thu, Mar 2, 2023 at 1:07 PM Kyle Evans <kevans@freebsd.org> wrote: > On Thu, Mar 2, 2023 at 2:02 PM Steffen Nurpmeso <steffen@sdaoden.eu> > 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=ceb5f28ba5fcfa69de7410d2327\ > > |d4a5abf2a421f > > ... > > |commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f > > |Author: Ed Maste <emaste@FreeBSD.org> > > |AuthorDate: 2022-12-14 17:34:59 +0000 > > |Commit: Ed Maste <emaste@FreeBSD.org> > > |CommitDate: 2023-03-02 01:20:33 +0000 > > | > > | freebsd-update: re-edit files if merge conflict markers remain > > ... > > |+ if ! egrep -q > '^(<<<<<<<|=======|>>>>>>>)(\ > > |[[: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 [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Mar 2, 2023 at 1:07 PM Kyle Evans <<a href="mailto:kevans@freebsd.org">kevans@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Thu, Mar 2, 2023 at 2:02 PM Steffen Nurpmeso <<a href="mailto:steffen@sdaoden.eu" target="_blank">steffen@sdaoden.eu</a>> wrote:<br> ><br> > Hello, .. sorry to be back again, and then it is you once more..<br> ><br> > Ed Maste wrote in<br> > <<a href="mailto:202303020121.3221LWHh070834@gitrepo.freebsd.org" target="_blank">202303020121.3221LWHh070834@gitrepo.freebsd.org</a>>:<br> > |The branch main has been updated by emaste:<br> > |<br> > |URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=ceb5f28ba5fcfa69de7410d2327%5C" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=ceb5f28ba5fcfa69de7410d2327\</a><br>; > |d4a5abf2a421f<br> > ...<br> > |commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f<br> > |Author: Ed Maste <emaste@FreeBSD.org><br> > |AuthorDate: 2022-12-14 17:34:59 +0000<br> > |Commit: Ed Maste <emaste@FreeBSD.org><br> > |CommitDate: 2023-03-02 01:20:33 +0000<br> > |<br> > | freebsd-update: re-edit files if merge conflict markers remain<br> > ...<br> > |+ if ! egrep -q '^(<<<<<<<|=======|>>>>>>>)(\<br> > |[[:space:]].*)?$' $(pwd)/merge/new/${F} ; then<br> > ...<br> ><br> > It is because i have written to postfix-users with the subject<br> > "(GNU) egrep is obsolescent" right before i read your commit:<br> ><br> > [... snip ...]<br> ><br> > So i thought .. maybe to bring the in-line-with-Linux to an<br> > extend, a FreeBSD style thing on the use of grep -E, maybe.<br> ><br> <br> I'd really prefer not to be annoying about it until we actually plan<br> to deprecate it, and I haven't seen a single call for removing it from<br> FreeBSD.<br></blockquote><div><br></div><div>I doubt egrep will ever be deprecated. Too many scripts depend on it.</div><div>And fixing this one is a drop in the bucket. I personally think the warning</div><div>from gnu-grep is bananas...</div><div><br></div><div>Warner</div></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpW0iv_sO5ae8qUED-FWY-Lt0WM5_DAtouzS_-n-Cun_Q>