How to deal with both git trees

[Paul Vriens]

Hi,

I've sent in a patch that got some remarks by Juan Lang. The patch is
already applied to mmbranch.

Most patches sent to wine-patches that have (valid) comments will not be
applied by AJ.

Should I now resend to make sure it gets applied when AJ is back AND
sent a patch to fixup mmbranch. Or will the previous one be reverted and
the next applied to mmbranch?

Cheers,

Paul.

[Mike McCormack]

Paul Vriens wrote:
> I've sent in a patch that got some remarks by Juan Lang. The patch is
> already applied to mmbranch.
>
> Most patches sent to wine-patches that have (valid) comments will not be
> applied by AJ.
>
> Should I now resend to make sure it gets applied when AJ is back AND
> sent a patch to fixup mmbranch. Or will the previous one be reverted and
> the next applied to mmbranch?

Resend the whole patch as it should be, and I'll revert the old one and 
reapply the one you send.  That's what I've done with Roderick's 
x11drv/opengl patches, and it should make it easier for Alexandre to 
just pick the newest one from wine-patches when he gets back from holidays.

Mike