From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B97FD13838B for ; Sun, 14 Sep 2014 16:10:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 100C4E0932; Sun, 14 Sep 2014 16:10:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24E1AE0903 for ; Sun, 14 Sep 2014 16:10:43 +0000 (UTC) Received: from 127.0.0.1 (unknown [192.95.39.56]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: hasufell) by smtp.gentoo.org (Postfix) with ESMTPSA id 2C8283401F6 for ; Sun, 14 Sep 2014 16:10:40 +0000 (UTC) Message-ID: <5415BDFA.4080600@gentoo.org> Date: Sun, 14 Sep 2014 16:10:34 +0000 From: hasufell Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 To: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] Re: My masterplan for git migration (+ looking for infra to test it) References: <20140914140344.6c6b99e5@pomiot.lan> <20140914165624.4a0b9101@pomiot.lan> In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: d28edb9e-8178-4425-94ce-b9ba546fe91f X-Archives-Hash: 312f5d9be1b4e076c18bc1796cca1e74 Rich Freeman: > On Sun, Sep 14, 2014 at 10:56 AM, Michał Górny wrote: >> Dnia 2014-09-14, o godz. 10:33:03 >> >> With git, we can finally do stuff like preparing everything and pushing >> in one go. Rebasing or merging will be much easier then, since >> the effective push rate will be smaller than current commit rate. > > While I agree that the ability to consolidate commits will definitely > help with the commit rate, I'm not sure it will make a big difference. > It will turn a kde stablereq from 300 commits into 1, and do the same > for things like package moves and such. However, I suspect that the > vast majority of our commits are things like bumps on individual > packages that will always be individual commits. Maybe insofar as one > person does a bunch of them they can be pushed at the same time, > but... > > Looking at https://github.com/rich0/gentoo-gitmig-2014-02-21 it seems > like we get about 150 commits/day on busy days. I suspect that isn't > evenly distributed, but you may be right that it will just work out. > If the push frequency becomes so high that people barely get stuff pushed because of conflicts, then we simply have to say goodbye to the central repository workflow and have to establish a hierarchy where only a handful of people have direct push access and the rest is worked out through pull requests to project leads or dedicated reviewers. So the merging and rebasing work would then be done by fewer people instead of every single developer. But given that currently project leads may or may not be active I'm not sure that I'd vote for such a workflow. And I don't think we need that yet (although enforced review workflow is ofc superior in many ways). Let's try it with push access for every developer.