Manoj Srivastava <[EMAIL PROTECTED]> writes: > On Tue, 29 Apr 2008 22:10:41 -0700, Russ Allbery <[EMAIL PROTECTED]> said: >> Manoj Srivastava <[EMAIL PROTECTED]> writes:
>>> The following patch, from branch bug458910-rra, looks good to me. >> That's two seconds, so I should merge it. Is there some way that I can >> include the Acked-by information in a merge when I do the merge? Hm, >> actually, I'm guessing probably not, since that would involve changing >> the commit, which defeats the whole point of the merge. > You can create a whole new commit, perhaps by adding a ChangeLog > entry or something, and add the Acked-By: lines to the commit > message. Oh, hm. So make a second change on the branch that adds the debian/changelog and the upgrading-checklist changes and put the Acked-By lines in that commit, and then merge the whole branch and delete it (or equivalently, merge the branch and delete it and then make a second commit that changes the changelog and upgrading-checklist)? That makes a lot of sense to me, but I'm just double-checking, since whatever I do I'll document in the wiki as The Way To Do Things. -- Russ Allbery ([EMAIL PROTECTED]) <http://www.eyrie.org/~eagle/> -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
