From owner-svn-src-all@freebsd.org Fri Nov 8 15:48:29 2019 Return-Path: Delivered-To: svn-src-all@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 207141B616A; Fri, 8 Nov 2019 15:48:29 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 478l6j039mz4X0f; Fri, 8 Nov 2019 15:48:28 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qt1-x841.google.com with SMTP id o3so6943879qtj.8; Fri, 08 Nov 2019 07:48:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=wpmxzNjwmrOMVC3TYGifGplBs1Jmeal2KLWCbTCK+n0=; b=VZ5hQAps7leLxrCG7wcfIDQ9+S4VVoAxOpeM4L31fh4yjEltw1oHerjegGQsFsL+Yo qL7OIa50uRGXcnR+hdaqD/wox3ir/YetUF8ncHDf+00YGGM+xRhTkdAU0+ncaPLxJw/N L9Sl9proBgYJCGCGcFURVutsMieUjFX5FNX1VTjKSzQLVr1MXmEJ50c+C4r4GgXRHA07 KAGIVVZ/aZu4U+VFSkWoBVNKFxlcQ6jUPg5HdGO1KIwHIF18kSNO9PgvJYWnT8ngBoJJ zbTXP6Q3LW1iRoaqXWlf3lRKSFA3CX9ySOTPPNO8AEAAxo4scvJGVv42fllwuZHPdewN f5bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=wpmxzNjwmrOMVC3TYGifGplBs1Jmeal2KLWCbTCK+n0=; b=OPqy82IIKhrkwPXze03YNaVC2TDE7ek9VcZo69yQhCfZC/aatMSaqTH43wc/DLx5m4 yVZ/Rz/x+t/NuzHS9/ph76VkNfth4UQxNkdMt5xGPE2ygviLCCCMLWVvCHa9nxziqlsU 2E7PQ9VyalnvwyavTZCUhBR2BJn85HUc3wROAyq/cvkUHB1wSNoZ+mN+h3Yp8LuJcFir sXwLtaLrFFCqz+HnHzaJ+vIJhg19t2YHQ06rdfLNpVr0PvvJsSzcW+/ekz30sWmzT/mQ +L9VKQzXGdUb7+7IsR5JAJkL9HaDV75y6uK4Tm9ZblDvRn4gIvv0BAxC0uCR6QQKmdjb 9+Gw== X-Gm-Message-State: APjAAAU2MYU2iNhva7vSAbLRFlUk1jYZPtkIi/TOnj+x+Vm4BQm4efkQ CkNk/xDEfqi+3Q9mluLszAHYoNRHYew= X-Google-Smtp-Source: APXvYqyj59CmApXeDbdVwYBMh1mM22m3ePaGWuYGsDGsKOn1JBCNVMjz8RwAquWOhHWYvogmSnG9Fg== X-Received: by 2002:ac8:4403:: with SMTP id j3mr8550305qtn.66.1573228107405; Fri, 08 Nov 2019 07:48:27 -0800 (PST) Received: from raichu (toroon0560w-lp130-05-69-158-183-252.dsl.bell.ca. [69.158.183.252]) by smtp.gmail.com with ESMTPSA id 76sm3374830qke.111.2019.11.08.07.48.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2019 07:48:26 -0800 (PST) Sender: Mark Johnston Date: Fri, 8 Nov 2019 10:41:15 -0500 From: Mark Johnston To: Glen Barber Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r350089 - head Message-ID: <20191108154115.GA37198@raichu> References: <201907171909.x6HJ96Tu082986@repo.freebsd.org> <20191108151541.GU5599@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191108151541.GU5599@FreeBSD.org> User-Agent: Mutt/1.12.2 (2019-09-21) X-Rspamd-Queue-Id: 478l6j039mz4X0f X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.995,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2019 15:48:29 -0000 On Fri, Nov 08, 2019 at 03:15:41PM +0000, Glen Barber wrote: > On Wed, Jul 17, 2019 at 07:09:06PM +0000, Mark Johnston wrote: > > Author: markj > > Date: Wed Jul 17 19:09:05 2019 > > New Revision: 350089 > > URL: https://svnweb.freebsd.org/changeset/base/350089 > > > > Log: > > Add an initial RELNOTES file. > > > > The intent is to provide a convenient location to document changes > > that are relevant to users of binary FreeBSD distributions, in contrast > > with UPDATING, which exists to document caveats for users who build > > FreeBSD from source. > > > > This complements the "Relnotes:" tag in commit messages by providing a > > place to document the change in more detail, or in case a "Relnotes:" > > tag was accidentally omitted. In particular, "Relnotes:" should be > > used if you do not intend to document the change in RELNOTES for some > > reason. > > > > Changes to the file should not be MFCed. For now the file will exist > > only in head, but may be updated via direct commits to stable branches > > depending on how things go. > > > > I had to go look at the original thread to remind myself about this, but > regarding not MFCing changes from head to stable branches, I think there > may have been some confusion in the discussion. > > By "changes should not be MFCed", at least based on my recollection of > how the conversation was going, I (at least) meant "not MFCed, but > committed as a direct commit to stable branches." In other words, > merging the RELNOTES change from head to stable/X does not really make > sense, as the revision numbers will have changed, and would inevitably > cause merge conflicts. Right. I don't think there's any problem with having a per-branch RELNOTES file so long as they are maintained by direct commits. When I added the file I initially just wanted to target HEAD and see if people would actually add things to the file. > Now that 12.1 is out, maybe we can expand the idea of this file into > stable/12 and even stable/11. One additional idea that came to mind is > with the formatting for stable branches. > > For example, in head, there is: > > rNNNNNN: > The foo(8) utility was added. > > For stable branches, I would propose the format of: > > rNNNNNM, MFC of rNNNNNN: > The foo(8) utility was added. > > Thoughts? That seems reasonable to me.