From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28436 invoked by alias); 14 Dec 2012 14:50:31 -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: 30886 Received: (qmail 27434 invoked from network); 14 Dec 2012 14:50:27 -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,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=1355496263; bh=lf4c2yVtdf4/+8g4Ag/OS7L9BL+nkUvuXSWnbEIpBaM=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Received:From:To:Subject:MIME-Version:Content-Type:Content-ID:Date:Message-ID; b=HHdZIEW1mNrTuFTKgPXxFVFJ6R6Z8+7XewECwrLTnbBuKRrpQOdkfT1iy55iePRKQvBEBvEvvawizfQGB+Yqo6MnB8Vs3bilXPnDZbkU6flMcI/FdoZ3Wq9/wSmiOy9zMx3ScT57aUvyNYUnYf35wgnQzbzieqI0DSr/PoNJOCE= X-Yahoo-Newman-Id: 694717.56188.bm@smtp138.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: g7dcOS8VM1mgEKyz6HXJZwju6LyFTqEH7IruIdyC5SAX7sy REj9Ywd8rw9hDba__9Vsxzrm5ABCL.Fkm4rq_jGkrK_RG9.zpY__sPEAFwoE wDB.GkItv29jtUscAiUZSy4AKMLZItLnKPCn467NnNxHEKI6vNTkfWH42qdv pVR9vY0uvwdyEG49S4O66FfuS9lfwTUZmNgZM7w_a9tSFipA62nHhctp_3n6 JiA6l_0OY1WvqD4dsWj4WWE8tt_VL6HOkupRy86ZGI9CiVBddUG_blY__D6v 78byiw0tc9X8lTRX9GAKeJGWxitmdB.L5PBXuQ1MRkzST8HwWWK_WJnHqUDv .iT0wlH2FRzzwQfYj9NYImkYQ9.jd6nWi8G3e6wp_R281k7J8FdzZR91STWd 5oIcrha6RJxUzJxcvpdxqDyNyK06qlQ-- X-Yahoo-SMTP: opAkk_CswBAce_kJ3nIPlH80cJI- From: Oliver Kiddle To: Zsh workers Subject: Re: Access to CVS MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <17902.1355496260.1@thecus.kiddle.eu> Date: Fri, 14 Dec 2012 15:44:22 +0100 Message-ID: <17903.1355496262@thecus.kiddle.eu> Aaron Schrab wrote: > The `--ff-only` option is only somewhat useful here. It merely causes > the merge to be aborted if it can't be done without creating a merge > commit, in which case some other method of bringing in those changes > would need to be tried. I was trying to keep it reasonably brief. Feel free to suggest alternative wording. Aaron Schrab wrote: > At 07:37 -0800 13 Dec 2012, Bart Schaefer wrote: > >Is there any way to actually enforce this? > > If the main git repository were fully under our control, yes, a hook > could be setup there to reject pushes which introduce merge commits. For sourceforge, we can get at the repository using the shell access. The documentation mentions commit email hooks so others are probably possible. That said, I'm not sure it would be wise because it would also block merges from public feature branches. Peter Stephenson wrote: > It might be useful to give a sample list of explicit git commands to use > at each stage, in particular what you'd do for an initial commit, for > updating the commit with the mailing list ID, for any kind of trickery > to reduce the number of commits that get pushed, and for pushing it back > (as this is for those new to git you can assume the relationship between > the local archive and the remote master is simple and let the git gurus > do the clever stuff). Is that a suggestion for the contents of Etc/zsh-development-guide or just a case that it'd be useful. I'm assuming the latter - it's not like we have an introduction to CVS, autoconf, C etc in the file. Anyway, in that case it seems Phil and Frank have already answered this. Oliver