From owner-freebsd-stable@FreeBSD.ORG Wed Jul 18 13:38:09 2012 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98C0C106564A for ; Wed, 18 Jul 2012 13:38:09 +0000 (UTC) (envelope-from trent@snakebite.org) Received: from exchange.liveoffice.com (exchla3.liveoffice.com [64.70.67.188]) by mx1.freebsd.org (Postfix) with ESMTP id 73C1B8FC1B for ; Wed, 18 Jul 2012 13:38:09 +0000 (UTC) Received: from EXHUB02.exchhosting.com (192.168.11.214) by exhub07.exchhosting.com (192.168.11.103) with Microsoft SMTP Server (TLS) id 8.3.213.0; Wed, 18 Jul 2012 06:38:09 -0700 Received: from EXMBX10.exchhosting.com ([fe80::9c37:32f6:a508:a44f]) by exhub02.exchhosting.com ([fe80::311c:a4c3:90a7:3e53%12]) with mapi; Wed, 18 Jul 2012 06:38:08 -0700 From: Trent Nelson To: Warren Block , Eitan Adler Date: Wed, 18 Jul 2012 06:38:06 -0700 Thread-Topic: The MFC process... Thread-Index: Ac1k6pC3M2dnIINjQ3yoSMyDa66fKA== Message-ID: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Microsoft-MacOutlook/14.2.3.120616 acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Cc: David Magda , "freebsd-stable@freebsd.org" Subject: Re: The MFC process... X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jul 2012 13:38:09 -0000 On 7/17/12 2:40 PM, "Warren Block" wrote: >On Tue, 17 Jul 2012, Eitan Adler wrote: > >> On 17 July 2012 10:10, Warren Block wrote: > >>> Unless there was no PR. Which brings up the question of how can we >>>query >>> for MFCs now? For example, how many MFCs are past due? What is the >>>oldest >>> one? >> >> svn mergeinfo --show-revs eligible > >But those are just commits that svn sees as eligible for a merge, not >ones with an actual "MFC after" message. Those two concepts should be considered synonymous :-) >From a fitting-svn-best-practices-to-freebsd-development-style perspective, this is what developers should be doing: 1. If a change is eligible for MFC, obviously indicate that in the log message as usual. So, no change from how development is done now. 2. If a change is not eligible for MFC, or should never be merged back to stable for whatever reason, it should be blocked in such a way that svn will know never to suggest merging it. This would be done as follows: % cd /src/head [make change] % svn ci -m "..." Committed revision r890101 % cd /src/stable/9 % svn st [ should return nothing -- I.e. no local mods ] % svn merge --record-only -c890101 https://svn.freebsd.org/base/head . ... % svn ci -m "Blocking r890101." . If this approach is adopted by all developers -- `svn mergeinfo --show-revs eligible` will always do exactly what you want: show revisions eligible for MFC that have not yet been merged. You can run this command at any level, too. I did it at sys/dev/isp, because that's all I cared about, but you can go as deep or as shallow within the tree as you like. It would also be trivial to whip up a script that runs it at the top level, then for each rev, filter it based on committer. That would achieve Eitan's desired goal of "tell me all my outstanding head/ commits I need to MFC". Regards, Trent.