Testbot not accepting patch
jjmckenzie51 at earthlink.net
Sat Jan 15 10:01:01 CST 2011
On 1/15/11 8:53 AM, Greg Geldorp wrote:
> From: Alexandre Julliard
>> Greg Geldorp<ggeldorp at vmware.com> writes:
>>> You'll have to take up the apply failure on the status page with Alexandre.
>>> That message has nothing to do with the bot. Since the patch applied
>>> without problems for me too, it seems you might have caught Alexandre
>>> on a little mistake :-) (don't we all love it when we get confirmation
>>> that he's human?).
>> $ git apply 70225
>> error: patch failed: dlls/d3dx9_36/shader.c:874
>> error: dlls/d3dx9_36/shader.c: patch does not apply
>> Guess I'm not human after all ;-)
> Turns out that Travis decided to confuse us by attaching a slightly different
> patch to the first message of this thread on wine-devel compared to the patch
> that he sent to wine-patches. The wine-patches one doesn't apply, the wine-devel
> one does.
> Anyway, glad we sorted this out, I hate it when I have to adjust my view of
> the world.
Looks like it is time for [Try X] and a resubmission of the patch then.
I was confused as well until I tried it on my local git and it also
More information about the wine-devel