Reinhold Kainhofer <[email protected]> writes: > Am Wednesday, 21. September 2011, 15:04:05 schrieb David Kastrup: >> Reinhold Kainhofer <[email protected]> writes: >> > Am Wednesday, 21. September 2011, 10:52:37 schrieb David Kastrup: >> >> Perhaps it would be nice if we found a way to play with "Gerrit", >> >> supposedly a git-based system similar to Rietveld. >> > >> > I looked at gerrit a while ago. If you want to take a look at it: >> > http://server.kainhofer.com:8088/ >> > >> > Here is a quick summary: >> > >> > -) Each review is basically one commit in a branch on the gerrit server. >> >> Well, that's pretty much what we already have. > > No. In gerrit you really need to clean up your patches before you > submit them for review. I typically have lots of small commits in a > branch when I upload a patch to rietveld. git-cl will simply take the > diff to origin/master (i.e. all patches in the branch combined into > one large patch) and show the combined diff. gerrit, on the other > hand, will show each small patch as one review.
So what? Assume you have committed everything on branch untidy. Then you do git rebase origin git checkout -b tidy origin git checkout -p untidy And voila, you have patched in the current state of the untidy HEAD into your brandnew tidy branch and may choose to commit it. > So, I would have to clean up my local branch before submitting for > review (i.e. rebase -i and squash and reorder the patches). That's a > very fundamental difference in the approach. Rietveld works on the > diff level, gerrit on the git commit level. It is not hard to munch everything into one commit. The complex thing is dealing sensibly with stuff that you do _not_ want to have munched into a single commit. -- David Kastrup _______________________________________________ lilypond-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/lilypond-devel
