On Wed, 9 Jun 2010, Pekka Enberg wrote: > As I said, we can probably get away with that in slab.git because > we're so small but that doesn't work in general. > > If we ignore the fact how painful the actual rebase operation is > (there's a 'sleb/core' branch that shares the commits), I don't think > the revised history is 'cleaner' by any means. The current patches are > known to be good (I've tested them) but if I just replace them, all > the testing effort was basically wasted. So if I need to do a > git-bisect, for example, I didn't benefit one bit from testing the > original patches. > > The other issue is patch metadata. If I just nuke the existing > patches, I'm also could be dropping important stuff like Tested-by or > Reported-by tags. Yes, I realize that in this particular case, there's > none but the approach works only as long as you remember exactly what > you merged. > > There are probably other benefits for larger trees but those two are > enough for me to keep my published branches append-only. > I wasn't really trying to suggest an alternative way to do it for all git trees, I just thought that since Christoph wanted to repropose these changes in another set and given there's no harm in doing it within slab.git right now that you'd have no problem making an exception in this case just for a cleaner history later. If you'd like to keep a commit that is then completely obsoleted by another commit when it's on the tip of your tree right now and could be reverted with minimal work simply to follow this general principle, that's fine :) > > Let me know if my suggested changes should be add-on patches to > > Christoph's first five and I'll come up with a three patch series to do > > just that. > > Yes, I really would prefer incremental patches on top of the > 'slub/cleanups' branch. > Ok then, I'll send incremental changes based on my feedback of patches 1-5. Thanks! -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>