From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17700 invoked by alias); 20 Dec 2012 13:45:20 -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: 30920 Received: (qmail 18269 invoked from network); 20 Dec 2012 13:45:18 -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=-0.9 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED,RCVD_IN_DNSWL_NONE, T_DKIM_INVALID,T_TO_NO_BRKTS_FREEMAIL,UNPARSEABLE_RELAY autolearn=no version=3.3.2 Received-SPF: none (ns1.primenet.com.au: domain at yahoo.co.uk does not designate permitted sender hosts) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s1024; t=1356010708; bh=peOlSjPH8biwO4whC3ZCz9YE0ICDzhrFLbn+LTx6tPQ=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Received:In-reply-to:From:References:To:Subject:MIME-Version:Content-Type:Content-ID:Date:Message-ID; b=mJXJM2S1nUgOMtCl2N8Vm/r38zkqyTzCsPdYLnewuGURXG6Loiy/Z79BoTurAOA2DNwIx48gHz8/FPd3gUqw2+DMu2T+0RAk6LSptzXpF4ZAejWtMox9D1MLWNU0IUB8KV5MSF+bt+vOaIOmBc8ZWSd1mWzPgsZSqIe9AcNFJeI= X-Yahoo-Newman-Id: 292605.52482.bm@smtp146.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: tmhKjW4VM1kR1RUnbkQbQUzJZFOSajQsdtq6k_vxznvUt8D UGB1SqLrRcjoC3QAsH8Dk1SV4eAU5.xhMcCXM6vFzKnzuS4gGjGSTwEuI5tS fJ_mxDnyik9qJ4vQGlo_i8O3FB47TpVeEulrBQIEJyW4hHXhj915mJheW5rs _JTc33U8__3KupHkUMkq0abfvBjeonQjqOi3RaOe77QacRJIQnHnbO7c5Ypt NOJYUEvIJ06OV7mxoy0MHHXk.RKNrM7b0saFd045j2sOJrHx2rz_oSFVXRX. 9Fuv_isC5lXqk6BJkKuTFvxr5Qmb3_O3mmKsMiwp17FIRW7hcf5BXTvuORrK qQWBIf_RRWNz8rE6FXQxLQF52Zm2sj7ZnZ6TkUHl3z4Aa0fCj7eBi.Tgc18A yNn54CJVJOMYXJT6poNGKb5mV_U7CiU3cuLX6KIzB X-Yahoo-SMTP: opAkk_CswBAce_kJ3nIPlH80cJI- In-reply-to: <20121220095731.GA20954@redoubt.spodhuis.org> From: Oliver Kiddle 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> To: zsh-workers@zsh.org Subject: Re: PATCH: document git in Etc/zsh-development-guide MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <22537.1356008992.1@thecus.kiddle.eu> Date: Thu, 20 Dec 2012 14:38:27 +0100 Message-ID: <22690.1356010707@thecus.kiddle.eu> Phil Pennock wrote: > Sure, though the tone comes across as a little passive aggressive, which > hopefully is not what was intended. We also now have *two* git workflow > sections, contradicting each other. I'm sorry if the tone comes across badly. We already had two contractory workflows and that, more so than the sections, is what needs resolving. Unfortunately it is harder to consolidate two contradictory workflows than to take one as a baseline and discuss how it can be improved or where the interpretation of the consensus from earlier discussion was wrong. I don't want to obstruct things going forward so am happy to defer to you if you'd like to consolidate the text in the development guide. Alternatively, if you'd prefer, I can patch it. > 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. > Sharing the feature, for folks who want to see it and comment, as part > of feature branch work, and then cleaning up afterwards, so we don't end > up with thousands of branches. Sure, they're light, but that doesn't > mean housekeeping is unnecessary. 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. Oliver