From owner-dev-commits-src-branches@freebsd.org Fri Jan 22 14:26:22 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 703954F6459; Fri, 22 Jan 2021 14:26:22 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4DMhQM3dwTz3GMJ; Fri, 22 Jan 2021 14:26:19 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 94F922D4FC; Fri, 22 Jan 2021 14:26:15 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f42.google.com with SMTP id et9so2681762qvb.10; Fri, 22 Jan 2021 06:26:15 -0800 (PST) X-Gm-Message-State: AOAM5302PIAgART+gQGRSMMVR7iUcSp9tlZFNQSLPJ+6X15OjkT+8qOX BmJY93yRzMQ+f+n1TsI7QNk0KsCRK4a2pPexo1g= X-Google-Smtp-Source: ABdhPJy1mMw2MZiT93INOkgbXNN920r5PGNm+lRYYMvU9ECwXETA5lN7GWin45ZuzZU73Zh05GvWZBM+EpcLnid+wrk= X-Received: by 2002:a0c:8601:: with SMTP id p1mr4742432qva.22.1611325575002; Fri, 22 Jan 2021 06:26:15 -0800 (PST) MIME-Version: 1.0 References: <202101221230.10MCULuw000439@gitrepo.freebsd.org> <30b9e294-6767-abd4-e3a3-7a2d268323f9@selasky.org> In-Reply-To: <30b9e294-6767-abd4-e3a3-7a2d268323f9@selasky.org> From: Kyle Evans Date: Fri, 22 Jan 2021 08:26:02 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: e006b6a2c1b9 - stable/12 - MFC 376479200760: Fix whitespace in mlx5en(4). To: Hans Petter Selasky Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org, Warner Losh Content-Type: text/plain; charset="UTF-8" X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2021 14:26:22 -0000 On Fri, Jan 22, 2021 at 8:19 AM Hans Petter Selasky wrote: > > On 1/22/21 2:59 PM, Kyle Evans wrote: > > For the record, as per [0], these should have been cherry-picked using > > -x which adds a " (cherry picked from commit ...)" annotation at the > > bottom. With the annotation in place, the leading MFC line can be > > dropped and the original message otherwise preserved (dropping any > > metadata at the bottom that makes sense, e.g. "MFC after" tags). The > > -x line helps at least the MFC tracker match the commit from main. > > > > Thanks, > > > > Kyle Evans > > > > [0]https://github.com/bsdimp/freebsd-git-docs/blob/main/MFC.md > > Hi Kyle, > > Shouldn't the committers-guide be updated to reflect this is now the > official way to do it? > > https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/ > The committers guide wasn't going to be updated with the contents of Warner's freebsd-git-docs until the doc switch to a less arcane format. > I see no problem keeping MFC at the beginning of commit e-mails. Makes > it easier to sort, and it is backwards compatible! > > MFC rXXXXX refers to a SVN commit. > MFC [0-9 A-F] indicate a GIT commit. > > BTW: When MFC-ing a commit which was done using SVN, should we use MFC r > or refer to the git hash? > I can see a good argument for wanting to record the svn revision number where that's relevant, but I'd propose not prepending MFC when cherry-picking any git-originating commits so that oneline/shortlog or whatever it's called is as usable on stable as it is on main going forward. To be clear, I think the recommendation should be to: 1.) Use cherry-pick -x regardless so that the MFC tooling doesn't need to grok both going forward, and 2.) Optionally prepend an "MFC rXXXXXX" if it came from svn Thanks, Kyle Evans