Re: Processing Pull Request
On May 24, 2014, at 9:18 AM, Michael Osipov mosi...@gmx.de wrote: Hi, does it take special permissions on Github to process pull requests? Neither am I allowed to perform the merge from the website directly, nor does it display the command line steps as described in the GH help. Close is not available to me too. I simply pulled (PL 14) into my local repo and then pushed, asfgit processed but the PL is still on merged but not closed. Is there any writeup how a PL should happen in the project? Maven Git Convention [1] does not provide any valueable information. If it doesn’t auto close for whatever reason (likely a rebase or something), then you would need to put a comment on the pull request like: Can you verify that the functionality ha been merged correctly and close this if it has. or similar to get the requestor to close it. OR Make a simple commit with: This closes #14 in the log message and the asf bot will close it. OR File a request with INFRA to close it. In general, if you pull a pull request and it ends up rebating or similar so the sha1 is different, then you should likely do a “git -a —amend” and edit the commit message to to add the “This closes #XX” line to the message before you push. -- Daniel Kulp dk...@apache.org - http://dankulp.com/blog Talend Community Coder - http://coders.talend.com - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Processing Pull Request
Am 2014-05-26 14:54, schrieb Daniel Kulp: On May 24, 2014, at 9:18 AM, Michael Osipov mosi...@gmx.de wrote: Hi, does it take special permissions on Github to process pull requests? Neither am I allowed to perform the merge from the website directly, nor does it display the command line steps as described in the GH help. Close is not available to me too. I simply pulled (PL 14) into my local repo and then pushed, asfgit processed but the PL is still on merged but not closed. Is there any writeup how a PL should happen in the project? Maven Git Convention [1] does not provide any valueable information. If it doesn’t auto close for whatever reason (likely a rebase or something), then you would need to put a comment on the pull request like: Can you verify that the functionality ha been merged correctly and close this if it has. or similar to get the requestor to close it. OR Make a simple commit with: This closes #14 in the log message and the asf bot will close it. OR File a request with INFRA to close it. In general, if you pull a pull request and it ends up rebating or similar so the sha1 is different, then you should likely do a “git -a —amend” and edit the commit message to to add the “This closes #XX” line to the message before you push. Hi Daniel, I have amended the last commit, see https://github.com/apache/maven/pull/14#ref-commit-0499d1d. But I have simply merged that PR manually and then pushed to git.apache.org. Thus, I cannot have an additional commit w/o doing bogus. There must be some better way to process PRs. The best solution is to produce a commit like this [1] but I do not have the knowledge how to perform this with git means. That's is why I have for an improvements of the docs. Michael [1] https://git-wip-us.apache.org/repos/asf?p=maven.git;a=commit;h=bef7fac6e3495dae57a44e6a5902afd89c74b196 - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Processing Pull Request
Hi, does it take special permissions on Github to process pull requests? Neither am I allowed to perform the merge from the website directly, nor does it display the command line steps as described in the GH help. Close is not available to me too. I simply pulled (PL 14) into my local repo and then pushed, asfgit processed but the PL is still on merged but not closed. Is there any writeup how a PL should happen in the project? Maven Git Convention [1] does not provide any valueable information. Michael [1] http://maven.apache.org/developers/conventions/git.html - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Processing Pull Request
You add special comments to a commit to close a PR. I only have my phone I can't supply details. On May 25, 2014 6:04 PM, Michael Osipov mosi...@gmx.de wrote: Hi, does it take special permissions on Github to process pull requests? Neither am I allowed to perform the merge from the website directly, nor does it display the command line steps as described in the GH help. Close is not available to me too. I simply pulled (PL 14) into my local repo and then pushed, asfgit processed but the PL is still on merged but not closed. Is there any writeup how a PL should happen in the project? Maven Git Convention [1] does not provide any valueable information. Michael [1] http://maven.apache.org/developers/conventions/git.html - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Processing Pull Request
Hi, does it take special permissions on Github to process pull requests? Neither am I allowed to perform the merge from the website directly, nor does it display the command line steps as described in the GH help. Close is not available to me too. I simply pulled (PL 14) into my local repo and then pushed, asfgit processed but the PL is still on merged but not closed. Is there any writeup how a PL should happen in the project? Maven Git Convention [1] does not provide any valueable information. Michael [1] http://maven.apache.org/developers/conventions/git.html - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Processing Pull Request
Yes, I'm interested as well. On May 24, 2014, at 9:33 AM, Michael Osipov micha...@apache.org wrote: Hi, does it take special permissions on Github to process pull requests? Neither am I allowed to perform the merge from the website directly, nor does it display the command line steps as described in the GH help. Close is not available to me too. I simply pulled (PL 14) into my local repo and then pushed, asfgit processed but the PL is still on merged but not closed. Is there any writeup how a PL should happen in the project? Maven Git Convention [1] does not provide any valueable information. Michael [1] http://maven.apache.org/developers/conventions/git.html - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - To do two things at once is to do neither. -- Publilius Syrus, Roman slave, first century B.C.
Re: Processing Pull Request
Does this help? https://help.github.com/articles/using-pull-requests -- Alexander Kriegisch Am 24.05.2014 um 16:07 schrieb Jason van Zyl ja...@takari.io: Yes, I'm interested as well. On May 24, 2014, at 9:33 AM, Michael Osipov micha...@apache.org wrote: Hi, does it take special permissions on Github to process pull requests? Neither am I allowed to perform the merge from the website directly, nor does it display the command line steps as described in the GH help. Close is not available to me too. I simply pulled (PL 14) into my local repo and then pushed, asfgit processed but the PL is still on merged but not closed. Is there any writeup how a PL should happen in the project? Maven Git Convention [1] does not provide any valueable information. Michael [1] http://maven.apache.org/developers/conventions/git.html - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - To do two things at once is to do neither. -- Publilius Syrus, Roman slave, first century B.C. - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Processing Pull Request
As for necessary permissions: https://help.github.com/articles/what-are-the-different-access-permissions -- Alexander Kriegisch Am 24.05.2014 um 17:09 schrieb Alexander Kriegisch alexan...@kriegisch.name: Does this help? https://help.github.com/articles/using-pull-requests -- Alexander Kriegisch Am 24.05.2014 um 16:07 schrieb Jason van Zyl ja...@takari.io: Yes, I'm interested as well. On May 24, 2014, at 9:33 AM, Michael Osipov micha...@apache.org wrote: Hi, does it take special permissions on Github to process pull requests? Neither am I allowed to perform the merge from the website directly, nor does it display the command line steps as described in the GH help. Close is not available to me too. I simply pulled (PL 14) into my local repo and then pushed, asfgit processed but the PL is still on merged but not closed. Is there any writeup how a PL should happen in the project? Maven Git Convention [1] does not provide any valueable information. Michael [1] http://maven.apache.org/developers/conventions/git.html - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - To do two things at once is to do neither. -- Publilius Syrus, Roman slave, first century B.C. - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Processing Pull Request
The mechanics of processing PRs from repos we have access to is all good. But the Apache repos on Github I'm not sure who actually owns them, I assume ASF infra. For any moderately sized PR I add the PR as a remote and process it locally. But for simple patches I really would just like to hit the merge button. Our current setup doesn't allow this which is sub-optimal. On May 24, 2014, at 11:09 AM, Alexander Kriegisch alexan...@kriegisch.name wrote: Does this help? https://help.github.com/articles/using-pull-requests -- Alexander Kriegisch Am 24.05.2014 um 16:07 schrieb Jason van Zyl ja...@takari.io: Yes, I'm interested as well. On May 24, 2014, at 9:33 AM, Michael Osipov micha...@apache.org wrote: Hi, does it take special permissions on Github to process pull requests? Neither am I allowed to perform the merge from the website directly, nor does it display the command line steps as described in the GH help. Close is not available to me too. I simply pulled (PL 14) into my local repo and then pushed, asfgit processed but the PL is still on merged but not closed. Is there any writeup how a PL should happen in the project? Maven Git Convention [1] does not provide any valueable information. Michael [1] http://maven.apache.org/developers/conventions/git.html - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - To do two things at once is to do neither. -- Publilius Syrus, Roman slave, first century B.C. - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - There's no sense in being precise when you don't even know what you're talking about. -- John von Neumann
Re: Processing Pull Request
Am 2014-05-24 17:09, schrieb Alexander Kriegisch: Does this help? https://help.github.com/articles/using-pull-requests This can't help becuase the repos aren't located at github but at apache. - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Processing Pull Request
Am 2014-05-24 17:38, schrieb Alexander Kriegisch: As for necessary permissions: https://help.github.com/articles/what-are-the-different-access-permissions That's good but how does one know whether he as Write Access Teams Repository Access' or not. Especially for mirrored repos. - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Processing Pull Request
Am 2014-05-24 18:39, schrieb Jason van Zyl: The mechanics of processing PRs from repos we have access to is all good. But the Apache repos on Github I'm not sure who actually owns them, I assume ASF infra. For any moderately sized PR I add the PR as a remote and process it locally. But for simple patches I really would just like to hit the merge button. Our current setup doesn't allow this which is sub-optimal. On May 24, 2014, at 11:09 AM, Alexander Kriegisch alexan...@kriegisch.name wrote: Should we file an issue here: https://issues.apache.org/jira/browse/INFRA/component/12312655? Does this help? https://help.github.com/articles/using-pull-requests -- Alexander Kriegisch Am 24.05.2014 um 16:07 schrieb Jason van Zyl ja...@takari.io: Yes, I'm interested as well. On May 24, 2014, at 9:33 AM, Michael Osipov micha...@apache.org wrote: Hi, does it take special permissions on Github to process pull requests? Neither am I allowed to perform the merge from the website directly, nor does it display the command line steps as described in the GH help. Close is not available to me too. I simply pulled (PL 14) into my local repo and then pushed, asfgit processed but the PL is still on merged but not closed. Is there any writeup how a PL should happen in the project? Maven Git Convention [1] does not provide any valueable information. Michael [1] http://maven.apache.org/developers/conventions/git.html - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - To do two things at once is to do neither. -- Publilius Syrus, Roman slave, first century B.C. - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - There's no sense in being precise when you don't even know what you're talking about. -- John von Neumann - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Processing Pull Request
I am not a Maven or other Apache committer. I just wanted to help and saw the initial question about GitHub PRs which I have answered. I really cannot say anything intelligent about the follow-up questions though, only one general thing: Now you know what type of access right you need for GitHub PR merging, ask the respective repo owners to issue them to those who need it. Good luck -- Alexander Kriegisch Am 24.05.2014 um 18:48 schrieb Michael Osipov micha...@apache.org: Am 2014-05-24 17:38, schrieb Alexander Kriegisch: As for necessary permissions: https://help.github.com/articles/what-are-the-different-access-permissions That's good but how does one know whether he as Write Access Teams Repository Access' or not. Especially for mirrored repos. - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Processing Pull Request
Please don't use Github PL merge functionality. This will create merge commits... and I seriously dislike merge commits, hate them, actually. -- Regards, Igor On 2014-05-24, 12:39, Jason van Zyl wrote: The mechanics of processing PRs from repos we have access to is all good. But the Apache repos on Github I'm not sure who actually owns them, I assume ASF infra. For any moderately sized PR I add the PR as a remote and process it locally. But for simple patches I really would just like to hit the merge button. Our current setup doesn't allow this which is sub-optimal. On May 24, 2014, at 11:09 AM, Alexander Kriegisch alexan...@kriegisch.name wrote: Does this help? https://help.github.com/articles/using-pull-requests -- Alexander Kriegisch Am 24.05.2014 um 16:07 schrieb Jason van Zyl ja...@takari.io: Yes, I'm interested as well. On May 24, 2014, at 9:33 AM, Michael Osipov micha...@apache.org wrote: Hi, does it take special permissions on Github to process pull requests? Neither am I allowed to perform the merge from the website directly, nor does it display the command line steps as described in the GH help. Close is not available to me too. I simply pulled (PL 14) into my local repo and then pushed, asfgit processed but the PL is still on merged but not closed. Is there any writeup how a PL should happen in the project? Maven Git Convention [1] does not provide any valueable information. Michael [1] http://maven.apache.org/developers/conventions/git.html - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - To do two things at once is to do neither. -- Publilius Syrus, Roman slave, first century B.C. - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - There's no sense in being precise when you don't even know what you're talking about. -- John von Neumann - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Processing Pull Request
Am 2014-05-24 18:57, schrieb Igor Fedorenko: Please don't use Github PL merge functionality. This will create merge commits... and I seriously dislike merge commits, hate them, actually. Are you able to share your experience by improving the Git Convention on the Maven website? Me and others want a patch merged and not fiddling with Git issues actually. Thanks, Michael On 2014-05-24, 12:39, Jason van Zyl wrote: The mechanics of processing PRs from repos we have access to is all good. But the Apache repos on Github I'm not sure who actually owns them, I assume ASF infra. For any moderately sized PR I add the PR as a remote and process it locally. But for simple patches I really would just like to hit the merge button. Our current setup doesn't allow this which is sub-optimal. On May 24, 2014, at 11:09 AM, Alexander Kriegisch alexan...@kriegisch.name wrote: Does this help? https://help.github.com/articles/using-pull-requests -- Alexander Kriegisch Am 24.05.2014 um 16:07 schrieb Jason van Zyl ja...@takari.io: Yes, I'm interested as well. On May 24, 2014, at 9:33 AM, Michael Osipov micha...@apache.org wrote: Hi, does it take special permissions on Github to process pull requests? Neither am I allowed to perform the merge from the website directly, nor does it display the command line steps as described in the GH help. Close is not available to me too. I simply pulled (PL 14) into my local repo and then pushed, asfgit processed but the PL is still on merged but not closed. Is there any writeup how a PL should happen in the project? Maven Git Convention [1] does not provide any valueable information. Michael [1] http://maven.apache.org/developers/conventions/git.html - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - To do two things at once is to do neither. -- Publilius Syrus, Roman slave, first century B.C. - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - There's no sense in being precise when you don't even know what you're talking about. -- John von Neumann - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Processing Pull Request
I don't know what git issues you mean, but I can explain why I dislike github pull requests. My problem with pull-requests is two-fold. First, they create merge commits, which pollute commit history and make it much harder to comprehend. I've seen projects with tens of parallel commit lanes cross-merge between each other and their target branch. It's fine and justified when you have true multibranch development, but this is not reasonable when you have single new feature and/or bug fix. Second, pull-requests encourage multiple commits, when in most cases each pull-request corresponds to single logic change. This, too, makes commit history harder to comprehend for no good reason. Personally, I much prefer Gerrit approach, where contributors collaborate on a change until they are happy with it, then push the change to the target branch as single commit, while Gerrit still keeps all the discussion history if anyone wants to see how the end result came to be. -- Regards, Igor On 2014-05-24, 13:06, Michael Osipov wrote: Am 2014-05-24 18:57, schrieb Igor Fedorenko: Please don't use Github PL merge functionality. This will create merge commits... and I seriously dislike merge commits, hate them, actually. Are you able to share your experience by improving the Git Convention on the Maven website? Me and others want a patch merged and not fiddling with Git issues actually. Thanks, Michael On 2014-05-24, 12:39, Jason van Zyl wrote: The mechanics of processing PRs from repos we have access to is all good. But the Apache repos on Github I'm not sure who actually owns them, I assume ASF infra. For any moderately sized PR I add the PR as a remote and process it locally. But for simple patches I really would just like to hit the merge button. Our current setup doesn't allow this which is sub-optimal. On May 24, 2014, at 11:09 AM, Alexander Kriegisch alexan...@kriegisch.name wrote: Does this help? https://help.github.com/articles/using-pull-requests -- Alexander Kriegisch Am 24.05.2014 um 16:07 schrieb Jason van Zyl ja...@takari.io: Yes, I'm interested as well. On May 24, 2014, at 9:33 AM, Michael Osipov micha...@apache.org wrote: Hi, does it take special permissions on Github to process pull requests? Neither am I allowed to perform the merge from the website directly, nor does it display the command line steps as described in the GH help. Close is not available to me too. I simply pulled (PL 14) into my local repo and then pushed, asfgit processed but the PL is still on merged but not closed. Is there any writeup how a PL should happen in the project? Maven Git Convention [1] does not provide any valueable information. Michael [1] http://maven.apache.org/developers/conventions/git.html - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - To do two things at once is to do neither. -- Publilius Syrus, Roman slave, first century B.C. - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - There's no sense in being precise when you don't even know what you're talking about. -- John von Neumann - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Processing Pull Request
Am Sat, 24 May 2014 19:06:24 +0200 schrieb Michael Osipov micha...@apache.org: Am 2014-05-24 18:57, schrieb Igor Fedorenko: Please don't use Github PL merge functionality. This will create merge commits... and I seriously dislike merge commits, hate them, actually. Are you able to share your experience by improving the Git Convention on the Maven website? Me and others want a patch merged and not fiddling with Git issues actually. I agree, that the merge button has some limitations. It encourages commits without running local checks before (unless you set up a CI to check-build PRs automatically). And, as already pointed out, it does not easily allow to rebase. But, using the merge button is not the only permission on a Github repo which would be good for commiters: beeing able to close a PR if it is rejected or merged differently and maintaining issues would be a good thing to be able. I am not sure if Infra actually wants to maintain single-developer-to-repo-role permissions. After all GitHub is regarded as a mirror not a primary workflow participant. I have currently a PR open (for commons) and I am not sure if I want to open a Infra ticket for it to be closed or not,thats why I am interested in this topic as well. Greeetings Bernd - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Processing Pull Request
Am Sat, 24 May 2014 13:46:42 -0400 schrieb Igor Fedorenko i...@ifedorenko.com: Second, pull-requests encourage multiple commits, when in most cases each pull-request corresponds to single logic change. This, too, makes commit history harder to comprehend for no good reason. That is actually not a requirement, as a contributor you can propose a PR and as a commiter you can ask for fine-tuning the commit. This includes squashing, re-commenting and rebasing. You can do the dance back and forth until the commit meats your standard. This is the same as adding diffs and actually encourages a review workflow and is exactly the same as in Gerrit. Gruss Bernd - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
