On Wednesday 15 September 2010, Peter Rosin wrote: > Den 2010-09-15 12:47 skrev Stefano Lattarini: > > Honestly, I've never had to do such a "fake merge" myself in > > practice; but I can point you to the excellent explanation Ralf > > gave to me about the issue: > > <http://osdir.com/ml/automake-patches-gnu/2010-08/msg00066.html> > > Oh, I can see *why* you would want to do a "fake merge", Oh, sorry. > I was more interested in how to handle the ChangeLog and what to > put in the commit message. Honestly, I have no idea what the best policy would be. We could try to work one out when and if the necessity arise. > Looks like commit caf351c445a99e0a8e8bef2f8bc05624597bba13 is the > one Ralf referred to in that message, but that one does not bring > any light on the above questions. Especially considering that generated-yet-committed configure and Makefile.ins are not mentioned in the ChangeLog or in the git commit messages ;-) > (the answer for the other message will take a while, the testsuite > takes forever to complete on Windows) Maybe you could hold off doing a complete testsuite run until the amending iterations are over (they should be over for what concerns me, but remember that Ralf has not chimed in yet).
Regards, Stefano
