groovy-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Danny Hyun <hyun.da...@gmail.com>
Subject Re: PR and workflow [was [ANN] New committer: Shil Sinha]
Date Fri, 23 Oct 2015 15:56:13 GMT
Would be nice if we could maybe utilize git webhooks to cascade merges.

On Fri, Oct 23, 2015 at 11:52 AM, Thibault Kruse <tibokruse@googlemail.com>
wrote:

> There is an Apache policy that states that the "primary" repository of
> any apache project must be an apache hosted one (not github,
> bitbucket, etc).
>
> https://www.apache.org/dev/project-requirements:
> > The primary source control repository MUST be administered by the ASF
> Infra team on ASF hardware (currently, either using SVN or git). (citation
> needed)
>
> Now, the word "primary" seems ambiguous to me in what is allowed and
> what is not allowed, but apparently most apache project have decided
> to be on the safe side that new commits should be added to the apache
> repo first, and then synced to github, and never the other way round.
> This prevents the github repo to smell like a "primary" repository,
> even if most of the time, technically there is no difference in the
> end result (same commits end up both at apache and github).
> This means for merging native git commands have to be used by
> committers instead of using the github UI to merge (you pull from
> github, push to apache).
> Since this is a bit of a pain it seems several projects provide
> detailed instructions or custom scripts to help with that.
>
> Examples for custom scripts for merging:
>
> https://cwiki.apache.org/confluence/display/KAFKA/Merging+Github+Pull+Requests
>
> https://github.com/apache/cordova-coho/blob/master/docs/processing-pull-requests.md
> https://github.com/apache/parquet-mr/blob/master/dev/README.md
>
> I would also be curious if that is all that Cedric labelled as
> painful, or whether there are more issues.
>
> On Fri, Oct 23, 2015 at 7:18 AM, Russel Winder <russel@winder.org.uk>
> wrote:
> > On Thu, 2015-10-22 at 18:02 +0200, C├ędric Champeau wrote:
> >> Agreed. The only downside of this is that it is very painful to merge
> >> PRs
> >> on the GitHub Apache mirror, and even more painful to backport
> >> changes.
> >
> > OK, so Apache still doesn't really get Git and GitHub oriented
> > workflows, it is still fundamentally a CVS/Subversion-based
> > organization. What is the fundamental workflow problem that you feel is
> > causing pain? Whatever it is, we must fix it, even if we have to
> > subvert the current official "Apache Way" workflow. Having a workflow
> > that works and is easy so that unpaid volunteers can actually achieve
> > progress on the project, but nonetheless ends up with the Apache
> > repository as mainline, is far, far, far more important than adherence
> > to some particular quasi-political philosophy.
> >
> > --
> > Russel.
> >
> =============================================================================
> > Dr Russel Winder      t: +44 20 7585 2200   voip:
> sip:russel.winder@ekiga.net
> > 41 Buckmaster Road    m: +44 7770 465 077   xmpp: russel@winder.org.uk
> > London SW11 1EN, UK   w: www.russel.org.uk  skype: russel_winder
> >
>



-- 
Thanks,

Daniel Hyun
blog: http://hyunlabs.com/

Mime
View raw message