You can merge this pull request into a Git repository by running:
$ git pull https://github.com/user/repo branchname
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/ant/1234.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1234
On 11 May 2014 15:05, Matt Sicker <boa...@gmail.com> wrote:
> And here's some more info about how to do that.
>
>
>
> On 11 May 2014 15:04, Matt Sicker <boa...@gmail.com> wrote:
>
>> I think it would work better to just do development on ASF, but accept
>> pull requests via GitHub somewhat manually. This is how it's done with
>> Apache Camel: http://camel.apache.org/contributing.html
>>
>> So it's done manually. Plus, nobody can write to the ASF GitHub repos
>> without pulling some strings in INFRA to do something about it, and I don't
>> think they like that idea anyhow due to the bylaws regarding what was
>> already said above.
>>
>>
>> On 7 May 2014 01:28, Jan Matèrne (jhm) <apa...@materne.de> wrote:
>>
>>> As a ASF project we MUST have a repo in Apache land:
>>> http://www.apache.org/dev/writable-git
>>> "ASF releases must be cut from the canonical ASF Git repositories."
>>>
>>> The absolute minimum is therefore:
>>> - working on somewhere else
>>> - starting a release:
>>> -- pull all changes to local
>>> -- push to ASF-repo
>>> -- create a branch/tag in the ASF repo for the release
>>> -- do the release
>>>
>>> But personally I prefer having one "right" repo in the ASF I could trust.
>>> Additional repos somewhere else (like on Github) could "just help".
>>>
>>> (If working with Git - would Gerrit a good candidate?)
>>>
>>>
>>> Jan
>>>
>>>
>>> > -----Ursprüngliche Nachricht-----
>>> > Von: Antoine Levy Lambert [mailto:anto...@gmx.de]
>>> > Gesendet: Mittwoch, 7. Mai 2014 02:18
>>> > An: Ant Developers List
>>> > Betreff: Re: Hoped for advantages of migrating to git
>>> >
>>> > Matt, Jesse,
>>> >
>>> > I think that both of you are basically saying that accepting pull
>>> > requests entered in github is going to be more manual work, including
>>> > more command line work, in the case of a migration to git-wip-
>>> > us.apache.org as opposed to migrating to use only github.
>>> >
>>> > I don’t know whether an option of using only github and not the ASF
>>> > hosted git is acceptable for the ASF ? for the Ant committers ?
>>> >
>>> > Personally I am already glad to have seen support to migrate to git,
>>> > and I would not want to push something more controversial.
>>> >
>>> > While github today is a very attractive platform, it could one day
>>> > diverge from ASF policies or make other changes in their terms and
>>> > conditions that we would dislike and not be able to influence.
>>> >
>>> > There is a file
>>> > https://svn.apache.org/repos/private/committers/docs/github_team.txt
>>> > which links the apache user ids of committers with their github ids, I
>>> > wonder whether this linkage gives write access to the github mirrors of
>>> > Apache projects ?
>>> >
>>> > Also, while researching this I found an interesting presentation by
>>> > Jukka Zitting [1] and a mail message concerning Apache and Github [2]
>>> > and also a wiki page from the Apache Cordova project [3]
>>> >
>>> > Best regards,
>>> >
>>> > Antoine
>>> >
>>> >
>>> > [1]
>>> http://www.slideshare.net/jukka/apache-development-with-github-and-
>>> > travis-ci
>>> > [2] http://mail-archives.apache.org/mod_mbox/lucene-
>>> > dev/201401.mbox/%3c596fff55-6e33-4451-93d4-75add6cad...@gmail.com%3E
>>> > [3] http://wiki.apache.org/cordova/GitWorkflow
>>> >
>>> >
>>> >
>>> > On May 6, 2014, at 6:33 PM, Matt Sicker <boa...@gmail.com> wrote:
>>> >
>>> > > I mean how do you accept pull requests? You wouldn't be able to do it
>>> > > through GitHub. You'd have to manually pull the branch from GitHub
>>> > > like the name "pull request" implies. If you could commit to GitHub,
>>> > > then you could add a remote besides origin for GitHub, then pull from
>>> > > the GitHub remote, then push to the ASF remote (origin).
>>> > >
>>> > >
>>> > > On 6 May 2014 01:45, Stefan Bodewig <bode...@apache.org> wrote:
>>> > >
>>> > >> On 2014-05-06, Matt Sicker wrote:
>>> > >>
>>> > >>> Git allows you to do both. You can auto-merge from GH, but I'm not
>>> > >>> sure how you can even get write access to ASF GH repos.
>>> > >>
>>> > >> You don't, you commit to the ASF repo and it gets mirrored.
>>> > >>
>>> > >> IIRC some projects have their own forks of the ASF mirror and accept
>>> > >> pull request on this fork. They then merge changes from their fork
>>> > >> to the ASF repo.
>>> > >>
>>> > >> I'm not conviced I'd want to work that way, applying PRs without the
>>> > >> Web-UI on a local checkout of the ASF git repo works fine for me.
>>> > >>
>>> > >> Stefan
>>> > >>
>>> > >> --------------------------------------------------------------------
>>> > -
>>> > >> To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org For
>>> > additional
>>> > >> commands, e-mail: dev-h...@ant.apache.org
>>> > >>
>>> > >>
>>> > >
>>> > >
>>> > > --
>>> > > Matt Sicker <boa...@gmail.com>
>>> >
>>> >
>>> > ---------------------------------------------------------------------
>>> > To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
>>> > For additional commands, e-mail: dev-h...@ant.apache.org
>>>
>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscr...@ant.apache.org
>>> For additional commands, e-mail: dev-h...@ant.apache.org
>>>
>>>
>>
>>
>> --
>> Matt Sicker <boa...@gmail.com>
>>
>
>
>
> --
> Matt Sicker <boa...@gmail.com>
>
--
Matt Sicker <boa...@gmail.com>
