Am 29.05.2011 um 19:35 schrieb Frédéric Delanoy:
Please skip this patch; it needs adaptation to avoid rebasing/merge conflicts due to changes to be done in patch " [7/8] d3d8: Use D3DRENDERSTATETYPE -> WINED3DRENDERSTATETYPE enum conversion function instead of implicit conversion (clang)."
I'll resend both patches in a subsequent series.
To avoid confusion it is better to resend them as [7/8] and [8/8] as long as the original patches aren't applied. Now I'd recommend you to wait until today's commit wave before resending anything else to see which patches are applied and resend the others.
On Mon, May 30, 2011 at 10:58, Stefan Dösinger stefandoesinger@gmx.at wrote:
Am 29.05.2011 um 19:35 schrieb Frédéric Delanoy:
Please skip this patch; it needs adaptation to avoid rebasing/merge conflicts due to changes to be done in patch " [7/8] d3d8: Use D3DRENDERSTATETYPE -> WINED3DRENDERSTATETYPE enum conversion function instead of implicit conversion (clang)."
I'll resend both patches in a subsequent series.
To avoid confusion it is better to resend them as [7/8] and [8/8] as long as the original patches aren't applied. Now I'd recommend you to wait until today's commit wave before resending anything else to see which patches are applied and resend the others.
Yeah right, I changed/adapted the title in [7/8] since the conv function wasn't needed anymore and thought that if I used a [7/8] with another subject and (try 2) it wouldn't be noticed straightforwardly.
Frédéric
On Monday 30 May 2011 11:29:26 Frédéric Delanoy wrote:
Yeah right, I changed/adapted the title in [7/8] since the conv function wasn't needed anymore and thought that if I used a [7/8] with another subject and (try 2) it wouldn't be noticed straightforwardly.
Nah, Alexandre's scripts work very well there, and if the scripts don't figure it out he does. However if you restart your numbering you'll confuse the winetestbot. Your patches don't change the tests though so the testbot didn't complain.