Re: git: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain

From: Kyle Evans <kevans_at_freebsd.org>
Date: Thu, 02 Mar 2023 20:07:09 UTC 
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.

Thanks,

Kyle Evans