announcing feed-pqm

Robert Collins robert.collins at canonical.com
Tue Mar 2 06:33:15 GMT 2010


On Tue, 2010-03-02 at 16:59 +1100, Martin Pool wrote:
> On 2 March 2010 16:41, Martin Pool <mbp at canonical.com> wrote:
> >  * dealing with merge conflicts
> 
> ... for your own branches, this is easy, you just push updates that
> fix the conflicts.  If you're mentoring someone else's merge, it's a
> bit harder.  Probably you want to push your own branch, and then tell
> Launchpad that your merge supersedes theirs (if that's possible?)
> 
> The lp model has a concept that an mp is queued for merge.  It's not
> exposed in the web ui.  I don't know if we should be setting it.

If you set it, PQM can be easily changed to look for this and use it
without needing an email to be sent. This integration is blocked on
having the queue concept exposed: I think hydrazine is a sufficient UI
for us.

-Rob
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100302/803058a1/attachment.pgp 


More information about the bazaar mailing list