Guys, I updated the section about pull requests on Wiki. Please take a look and provide your comments if you have any.
-Val On Fri, Aug 14, 2015 at 3:46 PM, Raul Kripalani <r...@evosent.com> wrote: > On 14 Aug 2015 23:41, "Valentin Kulichenko" <valentin.kuliche...@gmail.com > > > wrote: > > > > Agree. Actually, it's up to a committer, I think. I just don't see a > reason > > to have one-commit-per-pull-request requirement. From my understanding, > > this is not how pull requests work. > > Yeah, in reality it depends on the quality of the history at the > contributor's repo. If the commits are well structured, well described and > they follow best practices, I don't see why not merge it with a pull. > > > BTW, I just tested the process and it works like a charm. I like it! And > > I'm about to merge your contributions, Raul ;-) > > Woohoo! Party time! > > > -Val > > > > On Fri, Aug 14, 2015 at 3:34 PM, Raul Kripalani <ra...@apache.org> > wrote: > > > > > Although you can, I don't recommend merging the pull request directly > from > > > the contributor's Github repo into the ASF Git, as you will preserve > their > > > commit history. > > > > > > Normally you wouldn't be interested in doing so, as it might have taken > > > them 2, 5 or 10 commits to implement the contribution, and keeping that > > > history on our side is not useful nor does it provide value. > > > > > > Rather, it's cleaner to generate a patch and apply it in ASF Git. > > > > > > At Camel, we include a note "With thanks to John Doe" in the commit > message > > > to leave the meritocracy footprint. > > > > > > Raúl. > > > On 14 Aug 2015 01:55, "Dmitriy Setrakyan" <dsetrak...@apache.org> > wrote: > > > > > > > On Thu, Aug 13, 2015 at 5:51 PM, Konstantin Boudnik <c...@apache.org> > > > > wrote: > > > > > > > > > On Thu, Aug 13, 2015 at 05:40PM, Alexey Goncharuk wrote: > > > > > > Maybe I miss a good piece of information about how Git works, but > I > > > > > always > > > > > > thought that if a pull request is accepted, it will be merged to > the > > > > > GitHub > > > > > > mirror of Apache Ignite. How will this change get to the original > > > > Apache > > > > > > git repository? > > > > > > > > > > It won't. github repo is a mirror of Apache git mirror. In order to > > > have > > > > > the > > > > > changes from github PR to be in visible in the github a committer > needs > > > > to > > > > > commit it into our Apache repo. > > > > > > > > > > > > > Cos, will the original contributor's name be preserved or should the > > > Ignite > > > > committer add "-author" parameter when committing? > > > > > > > > > > > > > > > > > > Cos > > > > > > > > > > > Can somebody explain to me the merge procedure? > > > > > > > > > > > > 2015-08-12 3:15 GMT-07:00 Artem Shutak <ashu...@gridgain.com>: > > > > > > > > > > > > > Inline. > > > > > > > > > > > > > > On Wed, Aug 12, 2015 at 10:19 AM, Dmitriy Setrakyan < > > > > > dsetrak...@apache.org > > > > > > > > > > > > > > > wrote: > > > > > > > > > > > > > > > On Tue, Aug 11, 2015 at 6:28 AM, Artem Shutak < > > > > ashu...@gridgain.com> > > > > > > > > wrote: > > > > > > > > > > > > > > > > > And one more question. Is it mandatory to have possibility > > > works > > > > > via > > > > > > > > > patches if we will have pull-request way for contributions? > > > > > > > > > > > > > > > > > > I'd like to have only one approach. > > > > > > > > > > > > > > > > > > > > > > > > > Artem, if possible I would allow 2 approaches and document > the 2 > > > > > > > approaches > > > > > > > > on Wiki. > > > > > > > > > > > > > > > > > > > > > > At least it increases support efforts. And if all will use only > > > one, > > > > > then > > > > > > > there is a big chance that second will not work properly. > > > > > > > > > > > > > > And, to complete patch-way: > > > > > > > - need to split simple "master" builds and "patch" builds on TC > - I > > > > > can do > > > > > > > it by yourself. > > > > > > > - need to implement git-format-patch.bat for Windows users. > It's > > > not > > > > > > > mandatory, all can be done manually by contributors, but it > would > > > be > > > > > nice. > > > > > > > This script can make any Windows user (I'm not :) ). > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > One question, does a pull request automatically generate a > Jira > > > > > comment > > > > > > > > (see Spark, Camel)? > > > > > > > > > > > > > > > > > > > > > > I will look at mentioned projects. From my view, by default, > GitHub > > > > > know > > > > > > > nothing about our Jira. So, there's no way to GitHub can add > any > > > > > comments > > > > > > > to unknown Jira. > > > > > > > DVCS plugin - it's a standard way to acquaint Jira and GitHub > and > > > it > > > > > will > > > > > > > work pretty nice. > > > > > > > > > > > > > > --Artem-- > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -- Artem -- > > > > > > > > > > > > > > > > > > On Tue, Aug 11, 2015 at 4:15 PM, Artem Shutak < > > > > > ashu...@gridgain.com> > > > > > > > > > wrote: > > > > > > > > > > > > > > > > > > > Igniters, > > > > > > > > > > > > > > > > > > > > I'm working on > > > > https://issues.apache.org/jira/browse/IGNITE-1217 > > > > > . > > > > > > > > > > > > > > > > > > > > Currently, everyone can fork Mirror of Apache Ignite on > > > GitHub > > > > ( > > > > > > > > > > https://github.com/apache/incubator-ignite), works with > own > > > > fork > > > > > > > > (create > > > > > > > > > > branches, commit, pull changes at fork) and then creates > a > > > > > > > pull-request > > > > > > > > > to > > > > > > > > > > Mirror of Apache Ignite on GitHub (all changes should be > done > > > > in > > > > > one > > > > > > > > > commit > > > > > > > > > > as in patch-way approach). Then test TC builds will > triggered > > > > > > > > > > automatically. Results can be found by branch filtering > by > > > > > pattern > > > > > > > > > > <pull-request-number>/merge. "Merge" suffix here means > > > > > pull-request > > > > > > > > > merged > > > > > > > > > > with master branch (if pull-request at master branch). > > > > > > > > > > > > > > > > > > > > Notes: > > > > > > > > > > > > > > > > > > > > 1. I tried to use TC plugin for github to see TC result > at > > > > > > > > pull-request. > > > > > > > > > > But the plugin works in unexpected way and add comments > not > > > > only > > > > > to > > > > > > > > > > pull-requests. Example: > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > https://github.com/apache/incubator-ignite/commit/ae11e9b5aa9af4d0d58e2a16dd3a3331969961df#commitcomment-12635375 > > > > > > > > > > . > > > > > > > > > > Maybe someone had this problem before? > > > > > > > > > > > > > > > > > > > > 2. I'm looking for a simple way to add information about > new > > > > > > > > pull-request > > > > > > > > > > to associated jira. > > > > > > > > > > The better way to use existing Jira plugin for it - DVCS > > > > plugin ( > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > https://confluence.atlassian.com/display/BITBUCKET/Linking+Bitbucket+and+GitHub+accounts+to+JIRA > > > > > > > > > ). > > > > > > > > > > But I need both: Jira administration rights to configure > the > > > > > plugin > > > > > > > and > > > > > > > > > > GitHub password for "apache" user. Or I missed something > and > > > we > > > > > can't > > > > > > > > use > > > > > > > > > > this plugin at Apache infrastructure? > > > > > > > > > > Maybe someone can suggest another solution? > > > > > > > > > > > > > > > > > > > > Thanks, > > > > > > > > > > Artem. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >
