Date: Thu, 2 Mar 2023 14:07:09 -0600 From: Kyle Evans <kevans@freebsd.org> To: Ed Maste <emaste@freebsd.org>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Cc: Steffen Nurpmeso <steffen@sdaoden.eu> Subject: Re: git: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain Message-ID: <CACNAnaGpBNEWbmrkFQ1zpYn%2BfxvyduPoN2ymm7H56qGi3pHTCQ@mail.gmail.com> In-Reply-To: <20230302192204.YPJ7f%steffen@sdaoden.eu> References: <202303020121.3221LWHh070834@gitrepo.freebsd.org> <20230302192204.YPJ7f%steffen@sdaoden.eu>
next in thread | previous in thread | raw e-mail | index | archive | help
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=3Dceb5f28ba5fcfa69de7410d2= 327\ > |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. Thanks, Kyle Evans
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACNAnaGpBNEWbmrkFQ1zpYn%2BfxvyduPoN2ymm7H56qGi3pHTCQ>