From owner-freebsd-git@freebsd.org Thu Jun 25 12:55:26 2020 Return-Path: Delivered-To: freebsd-git@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 CF62535A8D8 for ; Thu, 25 Jun 2020 12:55:26 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t0Nt3S7Pz43S5; Thu, 25 Jun 2020 12:55:26 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f68.google.com with SMTP id m81so5918017ioa.1; Thu, 25 Jun 2020 05:55:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=5OMZSyj00bSyeJrL6crIv9DWAOiSmnVkJnppLQ7KsE4=; b=az6zN/545U1h5X9xOcjQuqCuL8GKsxG0hZN+YUeBdxQ2JJeim9+mf2iBk2g9Yf0cIx ouPM3RB2eZnAob4dukcL+GmlJ+P/duhV+aEeCvQBL/MhHtLAJR3rWj5UdaCzpaUUkoNg +OG4d2ZyOxzgDlkAm49tggPOR427owagReYG0H1CLHgfvo+Ku/FI7TajWsoAhakNfx5i /OsVJXsqq/ks6Fazg2Ake/QWtDicheYvWEgQGti7svYMNWEjfXPMyL3WPtoWT4oftOnB yTxbUihnqNat1j0qxv2JBVNtb3L69JKz6+3EfB+1CAZKjVAwkf817zfgImRZBp6VwoO3 YTOg== X-Gm-Message-State: AOAM533Ex4WezTbNpoMY8RKm/XQequ+dJqSdwU752g8UgnnxTJEO8ZQP vFd8XsBH7p/7KXS70fQ9oohG8WtK6A1QFw5iG72GoSW7 X-Google-Smtp-Source: ABdhPJw08kHhzomkolC8oE3blQE2BIYVmcTQVEJsyL6DxAPenpoprevB3bA9vk717PTdyg/6YqN9j5GtQ9YAX/V20zY= X-Received: by 2002:a02:908f:: with SMTP id x15mr3345142jaf.12.1593089723287; Thu, 25 Jun 2020 05:55:23 -0700 (PDT) MIME-Version: 1.0 References: <20200625082455.9f1343f6f353f4be24385bc6@FreeBSD.org> In-Reply-To: From: Ed Maste Date: Thu, 25 Jun 2020 08:55:10 -0400 Message-ID: Subject: Re: svn primer translation to git To: Kristof Provost Cc: Emanuel Haupt , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 49t0Nt3S7Pz43S5 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2020 12:55:26 -0000 On Thu, 25 Jun 2020 at 03:09, Kristof Provost wrote: > > The original commit already followed the =E2=80=98headline summary, expan= ded body=E2=80=99 rule. This MFC would also work (often there=E2=80=99s no = blank line between the =E2=80=98MFC=E2=80=99 and the next line), but I do w= onder if MFC r362183: netmap: vtnet: fix races in vtnet_netmap_reg() wouldn= =E2=80=99t be better. I agree we need to choose and document an approach. There are examples of your proposed style already. I would suggest we go one step further though; the source revision is really metadata, and ought to be tracked by the tools in an automated or semi-automated way. The git equivalent for MFCs is `git cherry-pick`, and it has a -x flag to append the original commit hash. Let's say I wanted to MFC r362543 (91285bbdc146 in the current GitHub mirro= r): ``` commit 91285bbdc146fee00b83b8605e11aec19ed18b2a Author: emaste Date: Tue Jun 23 15:36:05 2020 +0000 ldconfig: remove i386 aout invocation aout support in ldconfig hasn't been required since FreeBSD 2.x. Anyone still using FreeBSD 2 shared libraries can use a FreeBSD 2 ldconfig to generate aout ldconfig hints. Reviewed by: dim, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D24883 Notes: svn path=3D/head/; revision=3D362543 ``` To MFC this to a stable/12 worktree I could use ``` % git cherry-pick -x 91285bbdc146 ``` When I go to commit the default commit message is: ``` ldconfig: remove i386 aout invocation aout support in ldconfig hasn't been required since FreeBSD 2.x. Anyone still using FreeBSD 2 shared libraries can use a FreeBSD 2 ldconfig to generate aout ldconfig hints. Reviewed by: dim, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D24883 (cherry picked from commit 91285bbdc146fee00b83b8605e11aec19ed18b2a) # Conflicts: # libexec/rc/rc.d/ldconfig ``` I think this is fine, and consistency will facilitate tooling for automating to answer questions like "what commits of mine have not been merged to stable/12 yet?" (If I wrote git I'd choose a different format for the message, but consistency is more important than aesthetics here).