On Tue, 29 Apr 2008 23:35:33 -0700, Russ Allbery <[EMAIL PROTECTED]> said:
> 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.
I think the new commit goes on the branch, logically speaking,
since it is part of getting the branch ready. And we really have two
seconders sending in an ack, and we can record them separately, unless
they come in close together. In that case, the branch history would be
"proposed wording -- changes if any -- commit to show ack -- commit to
show ack "; then
git checkout master; git merge bug12345-owner
Under gitk, all the development, acks, etc can be seen on the
line belonging to the branch, and then when all is set, the branch is
merged in to master.
At this point, master is merged into all the pending bug
branches by the owners, a git diff master bug12345-owner will show the
exact changes being proposed by the unmerged branch.
manoj
--
Love is the process of my leading you gently back to yourself. Saint
Exupery
Manoj Srivastava <[EMAIL PROTECTED]> <http://www.debian.org/~srivasta/>
1024D/BF24424C print 4966 F272 D093 B493 410B 924B 21BA DABB BF24 424C
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
