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
--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 <kevans@freebsd.org> wrot= e: > 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 > > <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 <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 > '^(<<<<<<<|=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 <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Thu, Mar 2, 2023 at 1:07=E2=80=AFP= M Kyle Evans <<a href=3D"mailto:kevans@freebsd.org">kevans@freebsd.org</= a>> wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0p= x 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On= Thu, Mar 2, 2023 at 2:02=E2=80=AFPM Steffen Nurpmeso <<a href=3D"mailto= :steffen@sdaoden.eu" target=3D"_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> >=C2=A0 <<a href=3D"mailto:202303020121.3221LWHh070834@gitrepo.freebs= d.org" target=3D"_blank">202303020121.3221LWHh070834@gitrepo.freebsd.org</a= >>:<br> >=C2=A0 |The branch main has been updated by emaste:<br> >=C2=A0 |<br> >=C2=A0 |URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3Dceb5f= 28ba5fcfa69de7410d2327%5C" rel=3D"noreferrer" target=3D"_blank">https://cgi= t.FreeBSD.org/src/commit/?id=3Dceb5f28ba5fcfa69de7410d2327\</a><br> >=C2=A0 |d4a5abf2a421f<br> >=C2=A0 ...<br> >=C2=A0 |commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f<br> >=C2=A0 |Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org><= br> >=C2=A0 |AuthorDate: 2022-12-14 17:34:59 +0000<br> >=C2=A0 |Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org><= br> >=C2=A0 |CommitDate: 2023-03-02 01:20:33 +0000<br> >=C2=A0 |<br> >=C2=A0 |=C2=A0 =C2=A0 freebsd-update: re-edit files if merge conflict m= arkers remain<br> >=C2=A0 ...<br> >=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|>>>>>>>)(\<br> >=C2=A0 |[[:space:]].*)?$' $(pwd)/merge/new/${F} ; then<br> >=C2=A0 ...<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=C2=A0 ...]<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 dep= recated. 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> --000000000000b169a105f5f0cde1--
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>