Return-Path: X-Original-To: apmail-couchdb-dev-archive@www.apache.org Delivered-To: apmail-couchdb-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6F5B110900 for ; Tue, 4 Jun 2013 21:55:39 +0000 (UTC) Received: (qmail 72839 invoked by uid 500); 4 Jun 2013 21:55:39 -0000 Delivered-To: apmail-couchdb-dev-archive@couchdb.apache.org Received: (qmail 72796 invoked by uid 500); 4 Jun 2013 21:55:39 -0000 Mailing-List: contact dev-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list dev@couchdb.apache.org Received: (qmail 72783 invoked by uid 99); 4 Jun 2013 21:55:39 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 21:55:39 +0000 Received: from localhost (HELO mail-wi0-f171.google.com) (127.0.0.1) (smtp-auth username nslater, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 21:55:38 +0000 Received: by mail-wi0-f171.google.com with SMTP id hm9so1207332wib.16 for ; Tue, 04 Jun 2013 14:55:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-originating-ip:in-reply-to:references:date :message-id:subject:from:to:cc:content-type:x-gm-message-state; bh=Wat8FcYSP4D+8vw/ViY4Xz+8moru7hbkR4FkHWTFy/w=; b=geIEHNVWPz3K8pmyd3DH60bfEkrIjs33oWCS0wUKcd5DyGHVmQIoyXEoAmM9bRaqJc 0THB5+nGce7JMbhW01TztT4OWR2um7rUMWqupbqQ8OUI6R+rBveJ8LhqJNN3jqGipZDM c5kHROUTPSvTew7t5MfOiD7q8qzKT2f/v49wrDIbE9fqqYXbgWlPXzcrpn915oEVJvv4 kVjHD/4y8rZBy22f8ZC8WaR0g02ULZa7NyOUwSzq84f6L/zL7ofhVbpYQe2XNj9zEroj 6BoNDjYLGOXKhjzzo1X9FD0k1cJz2Eqygcu/sfq2vIb0kQxpFC1Mz7UHiPy0aN7Y0sql 4UTQ== MIME-Version: 1.0 X-Received: by 10.181.13.112 with SMTP id ex16mr3488929wid.28.1370382936992; Tue, 04 Jun 2013 14:55:36 -0700 (PDT) Received: by 10.216.72.199 with HTTP; Tue, 4 Jun 2013 14:55:36 -0700 (PDT) X-Originating-IP: [79.97.124.139] In-Reply-To: References: <51A8C604.3000104@apache.org> Date: Tue, 4 Jun 2013 22:55:36 +0100 Message-ID: Subject: Re: [REQUEST] Update on using git From: Noah Slater To: Noah Slater Cc: "dev@couchdb.apache.org" Content-Type: multipart/alternative; boundary=f46d043c06be2a88e204de5b2442 X-Gm-Message-State: ALoCoQmNJPJhuoN3IeXJiiIe75fxng1q3mdsy4fULeK7gmqKTwzNx5uzmUlenTwkBZVE9p0WnbD2 --f46d043c06be2a88e204de5b2442 Content-Type: text/plain; charset=ISO-8859-1 Note: I don't mean to put this on Bob. Anyone could drive this. But I do think it needs a driver. Bob, Randall, and Dirkjan all seem to have the most detailed thoughts on the subject, so I suggest one you might be in the best position. And to clarify: someone disagreeing with you isn't a blocker. We're aiming for discussion-lead decision-making. Feel free to supply the "decision-making" that compliments the "discussion-lead" part. ;) On 4 June 2013 22:36, Noah Slater wrote: > Odd way to phrase it. Alternative proposals should not be > a destructive part of the process. The goal here is to generate ideas, toss > out the ones that don't work, pick your favourite, and drive consensus on > it. > > So, there are two possible ways I can see this unfolding: > > * Everyone agrees with you that the git-flow stuff is not needed, in > which case, great. Work everyone's comments in to the original proposal, > and then move it from DISCUSS to VOTE. > > * There is still some disagreement about what we want to do. In this > case, I agree, we do not have consensus. (I wouldn't describe this as > a destruction of coherency. Instead: productive discussion!) The next > step forward in this instances is to drive that discussion, and hopefully > come out with a proposal that most people like. > > I note that Randal posted several mails, and so did Dirkjan. But nobody > has responded to them. A good way to kick this off again would be to > respond to those points, I think. > > I would love to drive this, but I can't, mostly because I have no idea > what I'm talking about when it comes to Git. ;) > > > On 4 June 2013 19:03, Robert Newson wrote: > >> Heh, if I felt I could conclude that thread I would have done so >> already. We had a reasonably well described approach at one point and >> coherency was destroyed by a late appearance of the git-flow >> alternative. >> >> B. >> >> >> On 4 June 2013 18:43, Noah Slater wrote: >> > This thread is concluded. :) I meant the "[DISCUSS] Git workflow" >> thread. >> > >> > >> > On 4 June 2013 18:41, Robert Newson wrote: >> > >> >> What's not concluded in this thread? >> >> >> >> B. >> >> >> >> >> >> On 4 June 2013 18:04, Noah Slater wrote: >> >> > Bob, are you able to help drive the Git thread to conclusion? We >> need to >> >> > clarify this and document it. Think a lot people are confused right >> now >> >> > since it seems everything is in the air. >> >> > >> >> > >> >> > On 31 May 2013 16:51, Robert Newson wrote: >> >> > >> >> >> master, as usual, and the x.y.z branches (for backports). All other >> >> >> branches should be feature or fix branches we've not deleted. >> >> >> >> >> >> B. >> >> >> >> >> >> On 31 May 2013 16:47, Wendall Cada wrote: >> >> >> > I'm fairly well versed in using git and different workflows, >> rebase, >> >> etc. >> >> >> > However, I'm utterly confused as to how I might contribute >> changes to >> >> >> > couchdb, what branches are relevant, etc. Is there documentation >> for >> >> >> this, >> >> >> > or a clear summary of decisions made? >> >> >> > >> >> >> > Thanks, >> >> >> > >> >> >> > Wendall >> >> >> >> >> > >> >> > >> >> > >> >> > -- >> >> > NS >> >> >> > >> > >> > >> > -- >> > NS >> > > > > -- > NS > -- NS --f46d043c06be2a88e204de5b2442--