Den 2010-09-15 12:47 skrev Stefano Lattarini: > On Wednesday 15 September 2010, Peter Rosin wrote: >> BTW, I forgot to ask before, but can you please point out such a >> fake merge, so that I can see what I should aim for? > 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", I was more interested in how to handle the ChangeLog and what to put in the commit message. 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. (the answer for the other message will take a while, the testsuite takes forever to complete on Windows) Cheers, Peter
