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

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:

 |I do not think this has been reported already, on systems which
 |use GNU grep(1) postfix produces obsoletion messages.
 |
 |  $ egrep x y
 |  egrep: warning: egrep is obsolescent; using grep -E
 ...
 |POSIX says on this
 |
 |  This grep has been enhanced in an upwards-compatible way to
 |  provide the exact functionality of the historical egrep and
 |  fgrep commands as well.
 |  It was the clear intention of the standard developers to
 |  consolidate the three greps into a single command.  The old
 |  egrep and fgrep commands are likely to be supported for many
 |  years to come as implementation extensions, allowing historical
 |  applications to operate unmodified..
 |
 |This seems to come from Issue 2, released January 1987.
 |BSD 4.4 writes in usr/src/usr.bin/grep/README/README.FIRST from
 |1987-06-24 (re-formatted):
 |
 |  here is the fast 'grep/egrep' package sent to comp.sources and
 |  u. c. berkeley.
 |  included are the prerequisite routines developed by henry
 |  spencer of univ. of toronto -- these are also part of the
 |  comp.sources archive.
 |
 |  i've already updated spencer's care package to incorporate three
 |  fixes which have appeared in the same forum.
 |
 |  the makefiles are configured for bsd 4.3 and sys5 unix.
 |  they assume that the spencer regexp() is not already in a system
 |  library -- read the makefile comments if this is not the case.
 |
 |  for stock 4.3 sites, apply the diff 'diff.egrep.y.bsd' to the
 |  existing source in /usr/src/usr.bin/egrep.y and re-make.  this
 |  adds full support for the -i option.  the procedure is then:
 |
 |          make
 |          sh eg.shell     # amusement
 |          make install
 |
 |  ames!jaw
 |
 |However, in System V10 it seems there was still a differentiation
 |even later
 |
 |  $ find . -type f -name '*grep*'
 |  ./V10/cmd/grep.c
 |  ./V10/cmd/fgrep.c
 |  ./V10/cmd/uucp/uugrep.c
 |  ./V10/cmd/gre/dofgrep.c
 |  ./V10/cmd/egrep/egrep.dist
 |  ./V10/cmd/egrep/egrep.c
 |  ./V10/cmd/backup.old/bgrep.c
 |
 |But BSD CSRG comes over with
 |
 |  $ git show master:usr.bin/grep/egrep/Makefile
 |  #       @(#)Makefile    8.1 (Berkeley) 6/27/93
 |...
 |  LINKS=  ${BINDIR}/egrep ${BINDIR}/grep ${BINDIR}/egrep ${BINDIR}/fgrep
 |  MLINKS= grep.1 egrep.1 grep.1 fgrep.1
 |...
 |
 |Which is 30 years ago.  I am pretty sure that around Y2K FreeBSD
 |and Linux used grep(1) as a multiplexer already.

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.

--steffen
|
|Der Kragenbaer,                The moon bear,
|der holt sich munter           he cheerfully and one by one
|einen nach dem anderen runter  wa.ks himself off
|(By Robert Gernhardt)