From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SbG9y-0006c5-3S for garchives@archives.gentoo.org; Sun, 03 Jun 2012 19:08:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 360B9E083B; Sun, 3 Jun 2012 19:08:07 +0000 (UTC) Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com [209.85.214.53]) by pigeon.gentoo.org (Postfix) with ESMTP id 49403E07F8 for ; Sun, 3 Jun 2012 19:07:20 +0000 (UTC) Received: by bkcjk13 with SMTP id jk13so3484237bkc.40 for ; Sun, 03 Jun 2012 12:07:19 -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:date :x-google-sender-auth:message-id:subject:from:to:content-type; bh=QIp2BPZJLWgMwLrFUQPzeMdryAMTreN8o0GNNcc8tKY=; b=O26zWc7uEbrgrp7xzg9370eE6PiuUcWqIon3a5/gqbN3wIvrb6tYs9gwjwv8LSdkyn bs4wrofxmUwCAWEiQGeglGsbKjwsEtLoX8KmMmmY2PAWtJrPkszL7x914PaJl63dCdJo zb9L6fjREfs0qTEdRbpf/TnnWZYB6yfZ/EN68ZfSZtOMsSRLIFQcD+tSseXUgHDyjpEa ZXyYTNMtEmbyLA6T9OBmMo6qOiZRs47uvvz3qZi+lQlKxtLUanjoXG564A+alqVYDTtE gYjca0CpmOC/QM4bDuqS9TuP1NsMhAPcavwPn/7wjxsIdiceFmtYEjIJf3ZQrEd1gWh8 ER3Q== 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 Received: by 10.204.152.196 with SMTP id h4mr5142425bkw.131.1338750439266; Sun, 03 Jun 2012 12:07:19 -0700 (PDT) Sender: freemanrich@gmail.com Received: by 10.204.149.211 with HTTP; Sun, 3 Jun 2012 12:07:19 -0700 (PDT) In-Reply-To: References: Date: Sun, 3 Jun 2012 15:07:19 -0400 X-Google-Sender-Auth: o5Bxu5WyQ0LDg_sLBWD0hNL_JWw Message-ID: Subject: Re: [gentoo-dev] Git braindump: 2 of N: developer interaction (merge co-ordinators) From: Rich Freeman To: gentoo-dev@lists.gentoo.org Content-Type: text/plain; charset=ISO-8859-1 X-Archives-Salt: d0f64d91-966b-4e13-bf78-e6d820d51aa3 X-Archives-Hash: 4937fb8ec75bb33c7fb1629a911d5a56 On Sun, Jun 3, 2012 at 2:21 PM, Dirkjan Ochtman wrote: > That makes a lot of sense. There are probably a bunch of > projects/teams where having their own branches makes some amount of > sense; but we should really try the free-for-all at first. So, it sounds like we have a migrated tree already. Why not just plan a few days where we tell everybody to just mirror their work as an experiment (it would be strongly encouraged but not mandatory if for some reason a few can't go along with it). So, devs would do their work in cvs, and then just do the exact same commit in git and push it. The rsync mirrors would of course stay with cvs (this is just a test). Perhaps we might even make it a complete free-for-all with no rules at first. Then we can circle back on the list and discuss what did and didn't work well. That could include rebase-vs-merge, problems with concurrency, and so on. A test of some sort would cut down the risk of the unexpected when we do the real migration. Rich