Re: Github pull requests for Maven Core
http://java.dzone.com/articles/squashing-github-pull-requests ? Regards, Hervé Le vendredi 30 mai 2014 09:57:18 Jason van Zyl a écrit : I'm happy to look at pull requests but in the future can anyone making a pull request please squash your commits before making the pull request. Eventually I want to use Gerrit and create a mechanism where pull requests can be tested against the ITs to make it easier for contributors to know they haven't broken anything. Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - We know what we are, but know not what we may be. -- Shakespeare - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Github pull requests for Maven Core
Hi, What do you mean by squashing commits? Do you mean: * intermediate crappy/local commits that were incorrectly pushed as-is without having been rebased interactively to provide a clean and understandable history (see the link provided by Hervé as an example) * or that any PR should be squashed into one and only one commit? I totally agree with the first proposition, but would disagree with the latter. Thanks for the clarification. 2014-05-30 15:57 GMT+02:00 Jason van Zyl ja...@takari.io: I'm happy to look at pull requests but in the future can anyone making a pull request please squash your commits before making the pull request. Eventually I want to use Gerrit and create a mechanism where pull requests can be tested against the ITs to make it easier for contributors to know they haven't broken anything. Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - We know what we are, but know not what we may be. -- Shakespeare -- Baptiste Batmat MATHUS - http://batmat.net Sauvez un arbre, Mangez un castor ! nbsp;!
Re: Github pull requests for Maven Core
On May 31, 2014, at 11:05 AM, Baptiste Mathus m...@batmat.net wrote: Hi, What do you mean by squashing commits? That a pull request should consist of a single, coherent commit. So during the development of the pull request it may consist of several commits but in its final form it needs to be a single commit that corresponds to the change. You normally use git rebase -i sha1-before-your-changes to associate all changes with one commit. You refer to this as squashing. Generally I now try to add a feature or change in a single commit, makes the history easier to look at. Do you mean: * intermediate crappy/local commits that were incorrectly pushed as-is without having been rebased interactively to provide a clean and understandable history (see the link provided by Hervé as an example) * or that any PR should be squashed into one and only one commit? I totally agree with the first proposition, but would disagree with the latter. Thanks for the clarification. 2014-05-30 15:57 GMT+02:00 Jason van Zyl ja...@takari.io: I'm happy to look at pull requests but in the future can anyone making a pull request please squash your commits before making the pull request. Eventually I want to use Gerrit and create a mechanism where pull requests can be tested against the ITs to make it easier for contributors to know they haven't broken anything. Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - We know what we are, but know not what we may be. -- Shakespeare -- Baptiste Batmat MATHUS - http://batmat.net Sauvez un arbre, Mangez un castor ! nbsp;! Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - The modern conservative is engaged in one of man's oldest exercises in moral philosophy; that is, the search for a superior moral justification for selfishness. -- John Kenneth Galbraith
Github pull requests for Maven Core
I'm happy to look at pull requests but in the future can anyone making a pull request please squash your commits before making the pull request. Eventually I want to use Gerrit and create a mechanism where pull requests can be tested against the ITs to make it easier for contributors to know they haven't broken anything. Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - We know what we are, but know not what we may be. -- Shakespeare
Re: Github pull requests for Maven Core
Am 2014-05-30 15:57, schrieb Jason van Zyl: I'm happy to look at pull requests but in the future can anyone making a pull request please squash your commits before making the pull request. Eventually I want to use Gerrit and create a mechanism where pull requests can be tested against the ITs to make it easier for contributors to know they haven't broken anything. I am about to open an issue with INFRA to inquire how a default PR procedure should look like with the mirrored repos at Github. I think we need a common approach for the entire ASF. Michael - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
Re: Github pull requests for Maven Core
On 30 May 2014 14:57, Jason van Zyl ja...@takari.io wrote: I'm happy to look at pull requests but in the future can anyone making a pull request please squash your commits before making the pull request. Eventually I want to use Gerrit and create a mechanism where pull requests can be tested against the ITs to make it N not Gerrit. If they are pull requests in github then use github tooling to interact with them. A pull request builder on our CI system will be sufficient (once I get the build isolation plugin for Jenkins so that we don't risk drive-by hacking of ASF hardware). Alternatively I am sure I could get my employers to donate some build minutes on our hardware to do the pull request building right now. easier for contributors to know they haven't broken anything. Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - We know what we are, but know not what we may be. -- Shakespeare
Re: Github pull requests for Maven Core
On May 30, 2014, at 10:42 AM, Stephen Connolly stephen.alan.conno...@gmail.com wrote: On 30 May 2014 14:57, Jason van Zyl ja...@takari.io wrote: I'm happy to look at pull requests but in the future can anyone making a pull request please squash your commits before making the pull request. Eventually I want to use Gerrit and create a mechanism where pull requests can be tested against the ITs to make it N not Gerrit. If they are pull requests in github then use github tooling to interact with them. I'm going to use whatever is most effective for me trying to work with someone else. If I'm going to try and teach new people about the core and have longer term dialogs over changes I will use whatever I think works best for the work at hand. For smaller things squashed pull-request are fine, for larger more significant changes I'm going to try Gerrit. I'm not forcing my workflow on you. A pull request builder on our CI system will be sufficient (once I get the build isolation plugin for Jenkins so that we don't risk drive-by hacking of ASF hardware). Alternatively I am sure I could get my employers to donate some build minutes on our hardware to do the pull request building right now. easier for contributors to know they haven't broken anything. Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - We know what we are, but know not what we may be. -- Shakespeare Thanks, Jason -- Jason van Zyl Founder, Apache Maven http://twitter.com/jvanzyl http://twitter.com/takari_io - happiness is like a butterfly: the more you chase it, the more it will elude you, but if you turn your attention to other things, it will come and sit softly on your shoulder ... -- Thoreau
Re: Github pull requests for Maven Core
Am 2014-05-30 15:57, schrieb Jason van Zyl: I'm happy to look at pull requests but in the future can anyone making a pull request please squash your commits before making the pull request. Eventually I want to use Gerrit and create a mechanism where pull requests can be tested against the ITs to make it easier for contributors to know they haven't broken anything. Issue created: https://issues.apache.org/jira/browse/INFRA-7836 - To unsubscribe, e-mail: dev-unsubscr...@maven.apache.org For additional commands, e-mail: dev-h...@maven.apache.org
