Re: Git workflow
Hi, fREW Schmidt wrote: I just threw together a workflow for git with rakudo ( http://wiki.github.com/rakudo/rakudo/frews-recommended-workflow) and I think it will help a lot. Hopefully I didn't make any mistakes. Anyway, I plan on trying it out tomorrow (Boo Haman!) and I'd appreciate it if anyone who knows git well will make any necesary changes. When you did more than one commit in the branch, please merge with the ---squash option, so that our dear pumpking only has to review one patch, not multiple. Cheers, Moritz
Re: Git workflow
Uhm, ignore me, it seems I can't read, it's already in there. Sorry for the noise. Moritz Moritz Lenz wrote: Hi, fREW Schmidt wrote: I just threw together a workflow for git with rakudo ( http://wiki.github.com/rakudo/rakudo/frews-recommended-workflow) and I think it will help a lot. Hopefully I didn't make any mistakes. Anyway, I plan on trying it out tomorrow (Boo Haman!) and I'd appreciate it if anyone who knows git well will make any necesary changes. When you did more than one commit in the branch, please merge with the ---squash option, so that our dear pumpking only has to review one patch, not multiple. Cheers, Moritz
Re: Git workflow
Moritz Lenz wrote in perl.perl6.compiler : Hi, fREW Schmidt wrote: I just threw together a workflow for git with rakudo ( http://wiki.github.com/rakudo/rakudo/frews-recommended-workflow) and I think it will help a lot. Hopefully I didn't make any mistakes. Anyway, I plan on trying it out tomorrow (Boo Haman!) and I'd appreciate it if anyone who knows git well will make any necesary changes. When you did more than one commit in the branch, please merge with the ---squash option, so that our dear pumpking only has to review one patch, not multiple. As someone who reviews patches quite often, my advice would be exactly the contrary -- I tend to prefer a series of small patches with long commit messages: that way it's easier to review the logic of the whole change. (Personal taste only.) -- It is official: perl people are crazy. -- Linus Torvalds on the git mailing list
Re: Git workflow
On Tue, Mar 10, 2009 at 08:40:12AM -, Rafael Garcia-Suarez wrote: Moritz Lenz wrote in perl.perl6.compiler : Hi, fREW Schmidt wrote: I just threw together a workflow for git with rakudo ( http://wiki.github.com/rakudo/rakudo/frews-recommended-workflow) and I think it will help a lot. Hopefully I didn't make any mistakes. Anyway, I plan on trying it out tomorrow (Boo Haman!) and I'd appreciate it if anyone who knows git well will make any necesary changes. When you did more than one commit in the branch, please merge with the ---squash option, so that our dear pumpking only has to review one patch, not multiple. As someone who reviews patches quite often, my advice would be exactly the contrary -- I tend to prefer a series of small patches with long commit messages: that way it's easier to review the logic of the whole change. (Personal taste only.) I think you should do both! :-) When you're committing false starts and partial implementations, you should use rebase -i and squash those commits into a single complete-feature commit (and thus a single patch). If, ultimately, the subject of your branch has several pieces or takes several steps to fully implement, each of those steps should be a commit of their own. Thus our pumpking will see a series of commits that could each probably stand on their own (though there may be some dependency ordering). And there shouldn't be any spurious or throw-away commit messages like Oops, forgot to twiddle the frobnitz in the previous commit Just my humble opinion, -Scott -- Jonathan Scott Duff d...@lighthouse.tamucc.edu
Re: Git workflow
On Tue, Mar 10, 2009 at 09:02:08AM -0500, Jonathan Scott Duff wrote: On Tue, Mar 10, 2009 at 08:40:12AM -, Rafael Garcia-Suarez wrote: Moritz Lenz wrote in perl.perl6.compiler : Hi, fREW Schmidt wrote: I just threw together a workflow for git with rakudo ( http://wiki.github.com/rakudo/rakudo/frews-recommended-workflow) and I think it will help a lot. Hopefully I didn't make any mistakes. Anyway, I plan on trying it out tomorrow (Boo Haman!) and I'd appreciate it if anyone who knows git well will make any necesary changes. When you did more than one commit in the branch, please merge with the ---squash option, so that our dear pumpking only has to review one patch, not multiple. As someone who reviews patches quite often, my advice would be exactly the contrary -- I tend to prefer a series of small patches with long commit messages: that way it's easier to review the logic of the whole change. (Personal taste only.) Our initial attempts in this regard didn't work well -- submissions would contain individual commits that contained lots of false starts and backtracks, making it hard to see the result. When you're committing false starts and partial implementations, you should use rebase -i and squash those commits into a single complete-feature commit (and thus a single patch). If, ultimately, the subject of your branch has several pieces or takes several steps to fully implement, each of those steps should be a commit of their own. Exactly. Pm
Re: Git workflow
On Mon, Mar 9, 2009 at 11:47 PM, fREW Schmidt fri...@gmail.com wrote: Hey guys, I just threw together a workflow for git with rakudo ( http://wiki.github.com/rakudo/rakudo/frews-recommended-workflow) and I think it will help a lot. Hopefully I didn't make any mistakes. Anyway, I plan on trying it out tomorrow (Boo Haman!) and I'd appreciate it if anyone who knows git well will make any necesary changes. Thanks! -- fREW Schmidt http://blog.afoolishmanifesto.com It's become quite obvious from these messages and from discussion on IRC (plus a personal experience) that the github pull request feature could use some help. I posted a request on githubs support page ( http://support.github.com/discussions/site/338-pull-request-comments-message-and-email) asking that comments on requests be made more obvious. Feel free to add your own thoughts to that page :-) In the meantime I am going to add some info on how to submit patches to RT to the rakudo-github wiki as it has been decided that we will do that for now. We can do both, but that seems to be a lot of work for both the submitter and pmichaud. Happy Purim! -- fREW Schmidt http://blog.afoolishmanifesto.com
Git workflow
Hey guys, I just threw together a workflow for git with rakudo ( http://wiki.github.com/rakudo/rakudo/frews-recommended-workflow) and I think it will help a lot. Hopefully I didn't make any mistakes. Anyway, I plan on trying it out tomorrow (Boo Haman!) and I'd appreciate it if anyone who knows git well will make any necesary changes. Thanks! -- fREW Schmidt http://blog.afoolishmanifesto.com
