From nobody Thu Mar 2 20:07:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PSMZr22VPz3wCmk; Thu, 2 Mar 2023 20:07:16 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PSMZr1MFWz3rc6; Thu, 2 Mar 2023 20:07:16 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677787636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UpqGXMi0gU+xgZPazGQUYvkVvgrBb/q3FUjnL7k/L6o=; b=qtGIo4EBZG6tBvqwF5Y2Rf0ns9hl1YcAUbJPAwtix0ROG4tCqGPt6HOM2VLI888WXCxr0S V5AB8VsXQonJrMGzq9nlTQ37INySKFtKFojOFrCxdR7xwi2FtXALFyIOt7uwe6J1D8gDpB 5/t8NQ/hwBs4si6fQexCZKDUjcwMT8rOhqRDmuBW447yGn47+QDmZG5l2AdJcajcyTUSQa m/Y6g/ulkbvP5xSHB2XmoHy6rqpSUGdlRp5nJpgD63adm9efTuPS9za5R1NREf0FLaTzIZ P5E3SkEtqYKXdU3Jn4Hk+ihLDSSTGf79Q5iYY8IOasFfhOtOc6N2N5EyL/82EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677787636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UpqGXMi0gU+xgZPazGQUYvkVvgrBb/q3FUjnL7k/L6o=; b=k7uaSeaawltl1NVfwReMcWFXjFvbdD4ro/Mpy9i0mee9ICcpyZF/qgoTopgbX6q3kf3Sb2 6BoJ/A9CyMCynu7wmRH09GXfk092gR9Ah2Vanl+Hks+4qUZj6IVfM8jmkimxOT/HH9PPSp iq09N3nhrYDvYlDM7SV+XKinbs+zdcMiDCwX9BpZEo8vOwUuYo0D7A/gFIG7HYutL3X/ru EUGhF9yhS4jKPD0rCn06klEh6NSeDph/2OJYE36/svTLcpONWCRMe7qlze17IswkCPT+Mo /m3JVQEenJhRZ+sTlaZwqPKgmyJUm+2BwhBNw2RM9h/1vQpmZHQFR0Xm9UStfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677787636; a=rsa-sha256; cv=none; b=BSFpl9KqUkfrOd3R8r7sqs6+WUiHsDWLWNXJ3R74RnK8Ps/t10+FFe+xWYAvlw8EVc+dEI rqXpCnuMjOiRcSS+utQKn70HJg8yVqglD805NOJGEeoZnA36E3GG1EytKCDj3VRX5q9ZC0 lrt4IS1M/wju3WRsdmp3FFc/4x6mTmOrQ4xf+FbhzGqj/CPSuDRtcS2hO+ZGQZaOuyA84H qIdPwf5OMZOSubmtGhQkspof/fmCXdNjTWCUY3KBY4mf3+jTTmFSIdAJXladjb3TyaVogx 0ZAMRCC8PpnTZGFCddkS9I2xOHzxomzxwA+9ilHXII25gvus+jHCpxEPpEgrMA== Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PSMZr0HYfzbpX; Thu, 2 Mar 2023 20:07:16 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f180.google.com with SMTP id j10so50743qkg.12; Thu, 02 Mar 2023 12:07:16 -0800 (PST) X-Gm-Message-State: AO0yUKUZE8rtJ/Jo+kyW+YfCRnEYViXER+Aouni/703YK1ZlB73wzQdh 2IRFEtXfeN8Bu/Qjlv0D0JSJnmXjZkBXFd4JTXQ= X-Google-Smtp-Source: AK7set+9zUgzxnEmP33KHutPNqOAIqPuA7TP6lqh6HsWvDNbyYVbSxmDrWrdiUEohQZnlVdYyvnXo9A2VRx3i46rvQs= X-Received: by 2002:a05:620a:2b03:b0:71f:b89c:69be with SMTP id do3-20020a05620a2b0300b0071fb89c69bemr2985447qkb.14.1677787635535; Thu, 02 Mar 2023 12:07:15 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202303020121.3221LWHh070834@gitrepo.freebsd.org> <20230302192204.YPJ7f%steffen@sdaoden.eu> In-Reply-To: <20230302192204.YPJ7f%steffen@sdaoden.eu> From: Kyle Evans Date: Thu, 2 Mar 2023 14:07:09 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: ceb5f28ba5fc - main - freebsd-update: re-edit files if merge conflict markers remain To: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Cc: Steffen Nurpmeso Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N On Thu, Mar 2, 2023 at 2:02=E2=80=AFPM Steffen Nurpmeso 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 > |AuthorDate: 2022-12-14 17:34:59 +0000 > |Commit: Ed Maste > |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