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 1SbXIA-0001Op-Ae for garchives@archives.gentoo.org; Mon, 04 Jun 2012 13:25:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59285E076B; Mon, 4 Jun 2012 13:25:30 +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 78B9BE0700 for ; Mon, 4 Jun 2012 13:24:46 +0000 (UTC) Received: by pbbrr13 with SMTP id rr13so7107986pbb.40 for ; Mon, 04 Jun 2012 06:24:45 -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=uSlO5hVqTSkTErPEeWyNUd1nSijUN9YgiA0FiO36w7M=; b=JOu2ME1sdYrwWUD18rLcVmPd/sd/h2Lcoe6v8xMUuxS+QZ4unS0RJIDBxPfaOX8Cvc ImoJHlDv/NPPSQX2H9TZTSaHqs5j8ytf2YLP7g6bhOxb6tcksjazqAXPDpeW9GN5shLh bzFCQFNVpJl6g8cFMEq6NMp1I0nDh4ycpCtAL+VY4oOR4lFn7S7PIdRkqTC+gRQmYMmy 4DwBHP1J8pblaXwsi7SIOV1N9jey1OnJv9kcWOpFa5JEuTT+vzPA+/7IpVgL+monLWl4 2kTrwqNtMzyZk2kHYlKYeZjpXi4MWG3jLfsqjdeMR4t5t7ZsQGv4Qjtw65I5SE3qOOF8 y0VQ== Received: by 10.68.221.98 with SMTP id qd2mr39786952pbc.3.1338816285834; Mon, 04 Jun 2012 06:24:45 -0700 (PDT) Received: from smtp.gmail.com:587 (74-95-192-101-SFBA.hfc.comcastbusiness.net. [74.95.192.101]) by mx.google.com with ESMTPS id jw3sm13289479pbc.65.2012.06.04.06.24.40 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 04 Jun 2012 06:24:44 -0700 (PDT) Received: by smtp.gmail.com:587 (sSMTP sendmail emulation); Mon, 04 Jun 2012 06:25:05 -0700 Date: Mon, 4 Jun 2012 06:25:05 -0700 From: Brian Harring To: kentfredric@gmail.com Cc: gentoo-dev@lists.gentoo.org Subject: Re: [gentoo-dev] Git braindump: 2 of N: developer interaction (merge co-ordinators) Message-ID: <20120604132505.GB23002@localhost> References: 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: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Archives-Salt: e5756303-fce2-466c-a329-5edda8116c15 X-Archives-Hash: 53a6977b92c47d78fd8de729530caebe On Mon, Jun 04, 2012 at 03:49:31AM +0000, Kent Fredric wrote: > On 3 June 2012 09:46, Robin H. Johnson wrote: > If there are enough "Alice" developers, is it a possibility that Bob > > will never have a chance to get his commit in? > > > > All this requires, is that in the time it takes Bob to do 'git pull', > > Alice manages to do 'git push' again. > > > > Alice can thus deprive Bob of a fair chance to get his commit in. > > Bob becomes an unhappy developer and gives up. > > There's an easier solution here: > > Bob pushes to a branch or to a public repo ( ie: github ) , and then > contacts Alice ( or somebody else ) who pulls their changes into the > tree on their behalf. > > Its not "ideal" but better than nothing. And certainly better than > being stuck on SVN where this case is virtually guaranteed and with no > viable workarounds when it is encountered. Kent, you did read Robin's email fully before commenting, right? ;) You just proposed 'merge lieutenants', which Robin already covered in the originating email of this thread: http://archives.gentoo.org/gentoo-dev/msg_f478e9cbb14feb01ad0771c5d24222c4.xml For the record, I'm against any form of merge lieutenant reliant on someone pulling shit in; automated (QA of some form) I'd be fine w/, although that's not simple machinery to slap into the proposals. While I do grok the potential issue of someone being a hog (specifically via blasting commit by commit rather than building up work locally, then pushing it in chunks), frankly... I'm not that concerned about it, and would rather deal w/ it if/when it occurs. The nature of our commits for the most part are standalone from others- that's not true of the kernel/mozilla, thus why I don't think their issues are necessarily ours. ~harring