mangos one Error when trying to apply a patch to mangos one

[jamie]

src/server.patch:161: tab in indent.
error: src/game/ChatHandler.cpp: No such file or directory
error: src/game/Language.h: No such file or directory
error: src/game/MiscHandler.cpp: No such file or directory
error: src/game/Player.cpp: No such file or directory
error: src/game/World.cpp: No such file or directory
error: src/game/World.h: No such file or directory
error: patch failed: src/mangosd/mangosd.conf.dist.in:208

 

Any ideas?

im running git apply server.patch

Would simply changing the paths in the file fix this? worried id break something

Willing to pay if someone can teamview and help

 

[Rochet2]

Try using git am instead of git apply.
If that does not work then try what you suggested as it is a simple solution that probably also works.
 

[jamie]

Hm no it

error: patch failed: src/game/Tools/Language.h:1019
error: src/game/Tools/Language.h: patch does not apply
error: patch failed: src/game/WorldHandlers/MiscHandler.cpp:252
error: src/game/WorldHandlers/MiscHandler.cpp: patch does not apply
error: patch failed: src/game/Object/Player.cpp:1274
error: src/game/Object/Player.cpp: patch does not apply
error: patch failed: src/mangosd/mangosd.conf.dist.in:208
error: src/mangosd/mangosd.conf.dist.in: patch does not apply

says this now

[Rochet2]

If the patch is old, then the code the patch tries to edit has changed and the patch cannot be applied automatically.
You should apply it manually.

To help with manual applying you can usually apply the patch partially automatically.
You can do that with --reject flag. Here is one documentation for it:

Quote

--reject

For atomicity, git apply by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave the rejected hunks in corresponding *.rej files.

It is used for example git apply something.diff or git am something.patch