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 1SbnoW-0007fV-Lm for garchives@archives.gentoo.org; Tue, 05 Jun 2012 07:04:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66517E05BE; Tue, 5 Jun 2012 07:04:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9A6FBE08DA for ; Tue, 5 Jun 2012 07:03:18 +0000 (UTC) Received: from pomiocik.lan (p14.ppp.polbox.pl [213.241.7.14]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 0901D1B4022; Tue, 5 Jun 2012 07:03:16 +0000 (UTC) Date: Tue, 5 Jun 2012 09:04:33 +0200 From: =?UTF-8?B?TWljaGHFgiBHw7Nybnk=?= To: gentoo-dev@lists.gentoo.org Cc: ferringb@gmail.com Subject: Re: [gentoo-dev] Git braindump: 2 of N: developer interaction (merge co-ordinators) Message-ID: <20120605090433.4d2fb020@pomiocik.lan> In-Reply-To: <20120604225753.GC3692@localhost> References: <20120604132505.GB23002@localhost> <4FCD3854.8030203@gentoo.org> <20120604225753.GC3692@localhost> Organization: Gentoo X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.10; x86_64-pc-linux-gnu) 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 Content-Type: multipart/signed; micalg=PGP-SHA256; boundary="Sig_/Yu2wnaQEh5_uptKvk/F5k7h"; protocol="application/pgp-signature" X-Archives-Salt: 105f29b7-3cd3-42e1-b059-03cce4819415 X-Archives-Hash: 6a98bd394d3ee612d943c98c66edb5a5 --Sig_/Yu2wnaQEh5_uptKvk/F5k7h Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Mon, 4 Jun 2012 15:57:53 -0700 Brian Harring wrote: > Btw, good catch on package.mask. Hhadn't thought of that, that=20 > *will* be the most contentious point. That can be dealt w/ via=20 > having git on portage-1 profile format so we'd have package.mask as=20 > directories (which Ciaran will validly hate, and I won't like=20 > due to having to write the portage-1 -> PMS translater for=20 > rsync distribution), or coming up w/ a different way to split the=20 > 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. --=20 Best regards, Micha=C5=82 G=C3=B3rny --Sig_/Yu2wnaQEh5_uptKvk/F5k7h Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iJwEAQEIAAYFAk/Nr4EACgkQfXuS5UK5QB1ExAP/QcsrvS/1+sWOxMiE5M37YDWA ZY54t9zj+ghbIwXZEgJWatjJmk4l161EiBcZC5bHgt7lpVfO6NFSPh7CU9fttJ6M mW/wQ1SQ2cjXpPs5Gx8Zrh+mkFflfetHukxz0kZ+jCQJK7d+G+v0sEAH+UHUz4WS b6JeVe9Gd+8aOJeiLDc= =ASEZ -----END PGP SIGNATURE----- --Sig_/Yu2wnaQEh5_uptKvk/F5k7h--