<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div><div>On 30 Sep 2011, at 15:19, Sanne Grinovero wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>Hi all,<br><br>the master branch is not compiling since the last commit "b6de38a",<br><br>but even before that it's not very clean: I'm seeing many branch<br>merges, history is an mess.<br></div></blockquote><div><br></div><div>You must be referring to:</div><div><div>de98c55 - Mircea Markus, 22 hours ago : Merge branch 'master' into t_ISPN-1131_final</div><div>166ec14 - Mircea Markus, 3 days ago : SPN-1131 - merge with master</div><div><br></div><div>Now there's a reason why merge was used there and not rebase. If you add a new file in a topic branch and modify it in several commits on the same topic branch, then during rebase git sees all these individual commits on the same files as conflicts, which makes rebase a real PTA. Optimistic locking impl had 52 commits, most of them touching same classes. </div></div><blockquote type="cite"><div><font class="Apple-style-span" color="#000000"><br></font>I'm going to recommend again to use Emmanuel's nice build script<br><a href="https://gist.github.com/789588">https://gist.github.com/789588</a> which verifies you're actually testing<br>the commit and not depending on other state,<br>and to really avoid using the web interface only to do reviews and<br>handle pull requests.<br><br>I know that's adding a bit of a burden to the reviewer's time, but<br>that's why the original committer should polish his patch in a logical<br>sequence and add enough commit comments to ease the reviewer's work as<br>much as possible; otherwise it seems that more often the reviewer does<br>more work than the original developer, who is not even taking<br>responsibility for his code as someone else will check it.<br><br>I'm not angry :) just worried the discipline is getting a bit too low<br>for the very demanding standards we aim for and calling for some more<br>attention.<br></div></blockquote>+1. My only concern is that during the 10 mins in which I run the tests, my laptop cannot be used for development. Hopefully I'll get a new, more performant one next spring :)</div><div><blockquote type="cite"><div><br>Sanne<br>_______________________________________________<br>infinispan-dev mailing list<br><a href="mailto:infinispan-dev@lists.jboss.org">infinispan-dev@lists.jboss.org</a><br>https://lists.jboss.org/mailman/listinfo/infinispan-dev<br></div></blockquote></div><br></body></html>