Patching The Server Using Diff via Linux

[Finale]

Hi Guys,

 

Anyone have encounter this error while patching your server using .DIFF file?

[root@ro3rd rAthena]# git apply patch.diff
patch.diff:30: trailing whitespace.

patch.diff:31: trailing whitespace.
100,guild_vs1,King of Emperium Hill,koe
fatal: corrupt patch at line 37
 

I'm currently trying to patch my server for KoE script. I'm using AnnieRuru's patch file > https://github.com/AnnieRuru/Release/blob/master/scripts/PvP %26 GvG/King of Emperium Hill/koe_1.2.diff

 

Thanks!

 

Edited June 11, 2023 by Finale

[Magnetix]

If you're using rAthena rev 2020+, you may want to apply the patch manually. Checking the diff file, castle.txt no longer exist.

[Poringo]

10 hours ago, Magnetix said:

If you're using rAthena rev 2020+, you may want to apply the patch manually. Checking the diff file, castle.txt no longer exist.

Is there a guide on how to do that?

[Sapito Sucio]

You  can try doing the following:
 

git apply --3way diffFile.diff

if it doesn't work then try this one: 

patch -p1 < diffFile.diff

 

[Poringo]

5 hours ago, sapitosucio said:

You  can try doing the following:
 

git apply --3way diffFile.diff

if it doesn't work then try this one: 

patch -p1 < diffFile.diff

I will try this one. Thank you!

[Finale]

8 hours ago, sapitosucio said:

You  can try doing the following:
 

git apply --3way diffFile.diff

if it doesn't work then try this one: 

patch -p1 < diffFile.diff

 

Hi, I tried running patch -p1 < patch.diff but I got this error:

[root@ro3rd rAthena]# patch -p1 < patch.diff
(Stripping trailing CRs from patch; use --binary to disable.)
patching file db/pre-re/castle_db.yml
Hunk #1 FAILED at 60.
1 out of 1 hunk FAILED -- saving rejects to file db/pre-re/castle_db.yml.rej
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/map/battle.cpp
Hunk #1 succeeded at 9680 with fuzz 2 (offset 2037 lines).
(Stripping trailing CRs from patch; use --binary to disable.)
patching file src/map/battle.hpp
patch unexpectedly ends in middle of line
Hunk #1 FAILED at 10.
1 out of 1 hunk FAILED -- saving rejects to file src/map/battle.hpp.rej