From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14229 invoked by alias); 9 Nov 2017 17:32:53 -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: List-Unsubscribe: X-Seq: 41999 Received: (qmail 12342 invoked by uid 1010); 9 Nov 2017 17:32:53 -0000 X-Qmail-Scanner-Diagnostics: from know-smtprelay-omc-2.server.virginmedia.net by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(80.0.253.66):SA:0(-4.7/5.0):. Processed in 6.095858 secs); 09 Nov 2017 17:32:53 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_PASS,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: p.w.stephenson@ntlworld.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | X-Originating-IP: [86.21.219.59] X-Authenticated-User: p.w.stephenson@ntlworld.com X-Spam: 0 X-Authority: v=2.1 cv=C4wUsl7+ c=1 sm=1 tr=0 a=utowdAHh8RITBM/6U1BPxA==:117 a=utowdAHh8RITBM/6U1BPxA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=IkcTkHD0fZMA:10 a=x7bEGLp0ZPQA:10 a=BrDiTsk0AAAA:8 a=FP58Ms26AAAA:8 a=p0WdMEafAAAA:8 a=NEAV23lmAAAA:8 a=Fb5UX2yy_EXaegN4ankA:9 a=QEXdDO2ut3YA:10 a=7EK-lt671nEA:10 a=fK1jZSgjKPFatbRoI9mg:22 Date: Thu, 09 Nov 2017 17:32:37 +0000 User-Agent: K-9 Mail for Android In-Reply-To: <31167.1510244459@thecus.kiddle.eu> References: <31167.1510244459@thecus.kiddle.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: pull requests for completion functions To: zsh-workers@zsh.org From: Peter Stephenson Message-ID: <016CE3D3-BAB1-41C8-A882-D3301F2D32F4@ntlworld.com> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ntlworld.com; s=meg.feb2017; t=1510248758; bh=YwpE7NHHnvUJZmVSFMQkCH/49A9YPNEwJDGLGol6+g4=; h=Date:In-Reply-To:References:Subject:To:From; b=2R3sgq1ZCrLaWizrvbpEaRWzmgEfI++qUjljPffRRWgmV8PrY2bPMjiCLmz+0B8gL 364ji55tT7MzEI2E4j7GMT68lFIrM+7co+1iewRG3PPLMsV8eTRaXhK41xd4Il7FSz j8Y4okHFLPX+ayMxMvTA3o8ntOEodMUXX2djCC5dLvsbqyNsecl5MeaeF5gag1Ei+v goROVA8/vtr5BVpbhAUrfyXnDyxVPHBx+Ld+9kTU8sHWS3GZ2CoWhJ7jmwxac9lOSk bb5UoAswwwDXFo9fKgEEod7/rvJMBlOb9sjcjvgfuEepfww2GnRunFS1qpQXoaHwD6 XiUbzKBBGmoSw== (Aplogies for fornatting, on my mobile=2E) I've certainly got no objection to more flexible arrangements for completi= on functions if that works=2E pws On 9 November 2017 16:20:59 GMT+00:00, Oliver Kiddle wrote: >I have tentatively added a short line to the bottom of the contributing >section of the web pages to indicate that completions are acceptable in >the form of pull/merge requests=2E The link is here: > > http://zsh=2Esourceforge=2Enet/Arc/git=2Ehtml > >Can I take silence to mean that people were happy with my suggestion on >this new policy? If not then please speak now, reverting the web page >is >easily done=2E > >My intended procedure for managing pull requests is as follows=2E > >First you need to add separate remote repositories: > git remote add gitlab https://gitlab=2Ecom/zsh-org/zsh=2Egit > git remote add github https://github=2Ecom/zsh-users/zsh=2Egit > >There's a variety of ways to fetch pull requests directly but I add a >line >in =2Egit/config under each section: > > under: [remote "gitlab"] >add: fetch =3D >+refs/merge-requests/*/head:refs/remotes/gitlab/merge-requests/* > under: [remote "github"] > add: fetch =3D +refs/pull/*:refs/remotes/github/pr/* > >Many projects use merges but, to keep things as consistent as possible >with current practices, for now I would cherry-pick individual pull >requests and amend the commit to add a ChangeLog entry and reference >to the commit message=2E For ChangeLog entries and commit messages, the >references might be something like "MR: #1"=2E Or do we need to be more >explicit, e=2Eg=2E "github PR: #1"? > >Any comments or suggestions would be welcome=2E > >Oliver --=20 Sent from my Android device with K-9 Mail=2E Please excuse my brevity=2E