From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14021 invoked by alias); 20 Dec 2012 21:15:28 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 30924 Received: (qmail 5822 invoked from network); 20 Dec 2012 21:15:26 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,RCVD_IN_DNSWL_MED,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.2 Received-SPF: none (ns1.primenet.com.au: domain at spodhuis.org does not designate permitted sender hosts) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=spodhuis.org; s=d201210; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=9JKmN/K/NGe1Jj7LRS5uPfCFZcqFYhVJytwOwQRxA5c=; b=kLD4TaLqVHpK2AheY+CZXllaIDogo8rKzX0S/azXNvMFTOVDDq4lkJKnock2suQG1lc0iv1Xnw4anJFWJOSELDPSqPvLi1AYWRPB3TX53KHJIYyMFGTfmqgKX1XM2T3cLSDawnCzYTrbrELivjZqscAZJQbvtM1rWcHAcjw4ITg=; Date: Thu, 20 Dec 2012 15:58:35 -0500 From: Phil Pennock To: Oliver Kiddle Cc: zsh-workers@zsh.org Subject: Re: PATCH: document git in Etc/zsh-development-guide Message-ID: <20121220205835.GA27675@redoubt.spodhuis.org> Mail-Followup-To: Oliver Kiddle , zsh-workers@zsh.org References: <20121217085215.GA87227@redoubt.spodhuis.org> <20121217101536.6825d808@pwslap01u.europe.root.pri> <20121217110035.GA89579@redoubt.spodhuis.org> <9514.1355752226@thecus.kiddle.eu> <20121218093618.GB11509@redoubt.spodhuis.org> <18174.1355925977@thecus.kiddle.eu> <20121220095731.GA20954@redoubt.spodhuis.org> <22690.1356010707@thecus.kiddle.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <22690.1356010707@thecus.kiddle.eu> On 2012-12-20 at 14:38 +0100, Oliver Kiddle wrote: > Alternatively, if you'd > prefer, I can patch it. You handle it. Your writing is clearer than mine. > > You skipped the commit numbers; my understanding of the simple process > > to date is that the code change is one commit, the changelog and > > integration is a second commit, see step 4. Yes, it's an extra commit, > > My understanding was that ChangeLog files would be handled by Peter > running Frank Terbeck's script at suitable times such as before a > release. See workers/30119. Peter's confirmed I'm not crazy. Thanks, Peter. :) > I would keep things simple, at least initially, and stick with patches > in the mailing list as the primary means of sharing new work. It's an > easy thing to change later once the two main developers get used to git. > But, I don't really mind either way. Right, I messed up. I was trying to add a description of how to do the second workflow, with sharing feature branches, so that when people moved beyond the very simple, they'd have a guide in how to start doing so. I think this was a mistake on my part. Oh, and if I go silent, it's a combination of work and travel keeping me from commenting, not the state of zsh/git. Please don't wait on me! -Phil