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 8F83813829C for ; Sun, 5 Jun 2016 17:35:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3167141F3; Sun, 5 Jun 2016 17:34:56 +0000 (UTC) Received: from mail-vk0-f44.google.com (mail-vk0-f44.google.com [209.85.213.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F11B254024 for ; Sun, 5 Jun 2016 17:34:44 +0000 (UTC) Received: by mail-vk0-f44.google.com with SMTP id d64so49654623vkb.0 for ; Sun, 05 Jun 2016 10:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=HmT7V8yEZ9VIZxA7UMEDcgAE/I7oaUwLa8NK8xN5+lk=; b=mYVnN29JuMFw3HUMBCJfFaMNz0J9k2qUbUbV6j97WQKIxyz4cIQFJ2MzOFLBLwk5ev 8p9vq+pcmLR4YlufjTo0WBS3jkg4OO7LmTvG8922qmGzuJuaegChs/6ghAHg9yKLulWH GCvaW2qtPvYQ1KOqPwN1wkPU3XLlodXh8Z+9E4QL8BTF96wiwiHBZO1DPofSw7i42v0G OEnBp8gHBxDqc1KYS9PnTxAi3fV0udioiD1DCV3581OOjK81oCY7QoBUkoW2J+WORA4K jHYdqlkVoSp4D/OuiwJYPsSt0cN8a1mstQz8B28ma7rWLggQVceWw0jM3kazf0hNIB+u +T8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=HmT7V8yEZ9VIZxA7UMEDcgAE/I7oaUwLa8NK8xN5+lk=; b=nIJOnmuaf0LlsK5+67dU9gTFq29anAjdpa7P5OeVd6g0eC1UCHmSe4SZGipfka+p+n 2X9DJ0Ju7x4j3gqreNHvwHNSDaPx51/+VXyFN+lkqvlG9r20a4KHrpcP3g21i0P5RfSb hirNaM75ezTUfYwWtm/dEnFVtGjnPBBzeylAm2qd3+MdSXjgJ96DO8yDpPjV82oBVSjK hbmiKW2TKyebuMtyQJAd2KCGuU7iXgbbm582LIb09FuIxuT73vYJ8e0jhW5i0rgxOXgA MWPIkbVgYB6CfuGfN21/ubBjnZPKuhxi6VNSraiwhTH0GAY0n69Xc0Zhbcq8QEAJOxEl QmWw== X-Gm-Message-State: ALyK8tLkAGIo5Z/ywjq90myd+bZXGxwlGphP5lT81dzRnEHQOvUGsd4ldEIVQrCiydp/+qT+gVMrvOWHxN7VVg== X-Received: by 10.31.222.197 with SMTP id v188mr6697171vkg.101.1465148083244; Sun, 05 Jun 2016 10:34:43 -0700 (PDT) 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 Sender: mr.jan.chren@gmail.com Received: by 10.159.33.4 with HTTP; Sun, 5 Jun 2016 10:34:03 -0700 (PDT) In-Reply-To: References: <20160605180426.696b172a.mgorny@gentoo.org> <575458F2.8080008@iee.org> From: rindeal Date: Sun, 5 Jun 2016 19:34:03 +0200 X-Google-Sender-Auth: zpptxWatt_x6PsJCJv4DC4RaVAw Message-ID: Subject: Re: [gentoo-dev] Repo mirror & CI project news: 'stable' gentoo branch, new repo stats, faster CI To: gentoo-dev@lists.gentoo.org Cc: m.j.everitt@iee.org, kentfredric@gmail.com Content-Type: text/plain; charset=UTF-8 X-Archives-Salt: 171b6202-44d0-43af-84f8-f5ea126f6f79 X-Archives-Hash: a4ace4edc91156c2b0088cee19e93ebd On 5 June 2016 at 19:13, Kent Fredric wrote: > On 6 June 2016 at 05:09, rindeal wrote: >> It is not, unless CI filters the broken commits in some miraculous >> way. With the current approach, both stable and master branch will >> contain the pollution of broken commits + their fixes, instead of >> having good commits only. > > > Doing that is of course, impossibly hard without having every > committer publish to their own branch, and having the "master" built > by *cherry* picking commit series that are "known good". > > Its doable, but the complexity it entails is just way more than is > suitable for the gentoo workflow, and is likely to create more > problems than it solves. > > The "no bad commits" requires there to be at last *some* branch > somewhere that is constantly not-fast-fowardwardable, and at least one > branch that serves as a synchronization point with strictly linear > history. It's not hard at all. Developers have branches (personal, feature/bug specific, ...), before merging to master they do a rebase+force push, let the CI check it, and if it passes they're allowed to merge it. No cherry-picking involved. Master is then always clean and happy. I'm not sure how well it scales, but for the 100-150 commits/day the tree sees currently, it should be doable.