Simon Large wrote:
> Flex wrote:
>> Hi all. I got this error every time I try to apply this patch. Being
>> over 188 many times but can't see anything wrong. Tried the latest
>> nighty - TortoiseSVN 1.4.0, Build 7547 too with same error. Is there
>> something wrong with it?
>>
>> ------------------------------------------------------------------------
>> Index: src/game/QuestHandler.cpp
>> ===================================================================
>> --- src/game/QuestHandler.cpp (revision 2264)
>> +++ src/game/QuestHandler.cpp (working copy)
>> @@ -87,6 +87,35 @@
>> sLog.outDebug( "WORLD: Received CMSG_QUESTGIVER_ACCEPT_QUEST npc
>> = %u, quest = %u",uint32(GUID_LOPART(guid)),quest );
>>
> --^
> This line (155) should have a single space (as opposed to the special
> characters '+', '-' and '@'. I guess this means the line is discarded
> from the hunk, which is then 1 line too short. If it doesn't increment
> the line count either, then line 188 appears to be the next @@ entry.
Correct, that's the reason.
What program did you use to create the patch? Because there are some
other lines in there which seem a little bit strange to me.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 22 18:30:13 2006