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 <gentoo-dev+bounces-52264-garchives=archives.gentoo.org@lists.gentoo.org>) id 1Sc125-0007ay-Dd for garchives@archives.gentoo.org; Tue, 05 Jun 2012 21:11:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A15EFE065E; Tue, 5 Jun 2012 21:11:03 +0000 (UTC) Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com [209.85.160.53]) by pigeon.gentoo.org (Postfix) with ESMTP id E5D60E0602 for <gentoo-dev@lists.gentoo.org>; Tue, 5 Jun 2012 21:10:08 +0000 (UTC) Received: by pbbrr13 with SMTP id rr13so9370139pbb.40 for <gentoo-dev@lists.gentoo.org>; Tue, 05 Jun 2012 14:10:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=vVSKNFo6lwkp1cBoKFlRIhgsfDeKbugmXv2i5H7EfMY=; b=NZ465jApZ1xhBdLy+syjb/YBF0W72p8RYuWBWJ8xU5ThQ1SGBZVup0aUWXuBXWa7FK lx/5xhLBlg0jFXwyInV+VFXe7EC31zknJ3H06vnftvE89E51ERJUuYjTaExNoKElzdAx 2bGb2tWxgcV96hEWRYDZkxsbposoNhx2HzpmC6JSe2HJIzfwPX9sIQABdcztIz13BGlw 6c7pu74x5Uwzsuc1QSuf/DFQeY6tcVK0RSA9mJJK5lqmdt78HN+13Kgsi8n84jBsLzN6 d8Xb9TNxMnuRpIhqoQCuH4NzU9xgzAUhrekW8k7g28sq44JpMGzZMs73w+Xn1M0iiqGA D/+Q== Received: by 10.68.236.129 with SMTP id uu1mr51259287pbc.77.1338930608289; Tue, 05 Jun 2012 14:10:08 -0700 (PDT) Received: from smtp.gmail.com:587 ([2620:0:1000:fd10:224:d7ff:feae:c014]) by mx.google.com with ESMTPS id qt10sm3563725pbc.57.2012.06.05.14.10.04 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jun 2012 14:10:06 -0700 (PDT) Received: by smtp.gmail.com:587 (sSMTP sendmail emulation); Tue, 05 Jun 2012 14:10:29 -0700 Date: Tue, 5 Jun 2012 14:10:29 -0700 From: Brian Harring <ferringb@gmail.com> To: Micha?? G??rny <mgorny@gentoo.org> Cc: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] Git braindump: 2 of N: developer interaction (merge co-ordinators) Message-ID: <20120605211029.GA10988@localhost.google.com> References: <robbat2-20120603T092545-185945341Z@orbis-terrarum.net> <CAATnKFBn2sZTjTuLLEJ69+TctvL4OPCbnx8DVi+3PAEfGZLtHQ@mail.gmail.com> <20120604132505.GB23002@localhost> <4FCD3854.8030203@gentoo.org> <20120604225753.GC3692@localhost> <20120605090433.4d2fb020@pomiocik.lan> Precedence: bulk List-Post: <mailto:gentoo-dev@lists.gentoo.org> List-Help: <mailto:gentoo-dev+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-dev+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-dev+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-dev.gentoo.org> X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20120605090433.4d2fb020@pomiocik.lan> User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: b1ae903e-4710-4f35-8f68-d4519404d5d6 X-Archives-Hash: e8abe9e143a48be43fc38ae7ea40c91c On Tue, Jun 05, 2012 at 09:04:33AM +0200, Micha?? G??rny wrote: > On Mon, 4 Jun 2012 15:57:53 -0700 > Brian Harring <ferringb@gmail.com> wrote: > > > Btw, good catch on package.mask. Hhadn't thought of that, that > > *will* be the most contentious point. That can be dealt w/ via > > having git on portage-1 profile format so we'd have package.mask as > > directories (which Ciaran will validly hate, and I won't like > > due to having to write the portage-1 -> PMS translater for > > rsync distribution), or coming up w/ a different way to split the > > commits across multiple files, rather than a single. > > That doesn't like a 'lesser evil' to me. I'd rather see those few > conflicts and fix them once in a while rather than having to lookup > multiple package.mask files with entries split in a semi-random manner. The rate of package.mask commits was calculated yesterday- it's around 4.5 a day. Non issue, move along... ~harring