[MERGE][PQM][Bug #246846] Attribute work using the 'author' attribute

Daniel Watkins daniel at daniel-watkins.co.uk
Fri Jul 18 15:29:47 BST 2008


Hi John,

Thanks for the feedback.  Below are some thoughts following some
discussion with my fellow sprinters.

On Tue, 15 Jul 2008 11:07:09 -0500
John Arbash Meinel <john at arbash-meinel.com> wrote:
> The small problem is who to assign the commit when *I* submit *your*
> patch. It is arguable that we want to add a new revision property
> "submitter" which works like author.
I've done this by passing a revprops dictionary containing a
'submitter' property, so consumers that care about this can look at it,
while no-one else has to worry about it.

> But that the *author* of the commit should be attributed to whoever
> wrote the original branch, and the *submitter* would be whoever sent
> this to PQM.
So we've got several views on this here:
  * the author of the merge commit should be the person who submitted
    because, in some sense, they are responsible for the creation of the
    clean merge commit
  * the author of the merge commit should actually be a list of all
    apparent authors of new commits in the branch to be merged (so both
    the author of the full branch and the submitter _if they had to do
    any cleanup_ would be listed as authors)
  * the author of the merge commit should be explicitly specified by the
    submitter

I'm not sure which of these is best, though I'm unconvinced by the
first one.  I'd appreciate input (or further views on the subject).

> We can debate this, as it adds quite a bit of complexity to stuff like
> 'pqm-submit' and pqm's processing. But it is probably the correct
> solution.
Well, if we go for the third, explicitly specifying, option above, I
think it would make sense to have an 'author' attribute on the merge
directive.  In order to merge accurately, PQM would need it, so the
merge directive should provide it.


Dan

-- 
Daniel Watkins (Odd_Bloke)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080718/12187a81/attachment.pgp 


More information about the bazaar mailing list