Drawprim.c patchwatcher failure

Chris Ahrendt celticht32 at aol.com
Thu Sep 11 20:34:03 CDT 2008


Vitaliy Margolen wrote:
> Chris Ahrendt wrote:
>> Dmitry Timoshkov wrote:
>>> "Chris Ahrendt" <celticht32 at aol.com> wrote:
>>>
>>>> patching file dlls/wined3d/drawprim.c
>>>> Hunk #2 FAILED at 448.
>>>> 1 out of 2 hunks FAILED -- saving rejects to file 
>>>> dlls/wined3d/drawprim.c.rej
>>>>
>>>> Dan what does this mean on a patch I submitted tonight????
>>> That means that the source you have used to generate the patch
>>> doesn't match what patch watcher uses (latest git).
>>>
>>>> How do I fix it?
>>> Update to current git and regenerate the patch:
>>>
>> The thing is I just did a refresh and it said I was up to date...
>>
>> I guess wait till tomorrow morning and submit it then
>>
> 
> The proper way to do it is:
> git fetch
> git rebase origin
> 
> For more information on how to use git see http://wiki.winehq.org/GitWine
> and of course git's manual.
> 
> Vitaliy.
Did that before I submitted it..

chris



More information about the wine-devel mailing list