applying patch error :(

[godhimself]

when i try to apply this patch (on latest MaNGOS from git) -> http://pastebin.ca/1608277

I get these errors:

[freghar]

Obviously, the patch does not apply.

You probably have incompatible patch<->source versions.

[xeross155]

Looks to me like a patch that combines ahbot and the nameannounce command. try to revert your source back to the revision that it's made for, apply the patch, and then merge the newest source into it.

[freghar]

Looks to me like a patch that combines ahbot and the nameannounce command. try to revert your source back to the revision that it's made for, apply the patch, and then merge the newest source into it.

That would, in fact, only help him with conflict resolution, it has no chance to resolve the conflicts as git-am (and git-apply IIRC too) does exactly that if a simple patch application fail.

See that "index c024989..e0e10fc 100644" line in each diff. The first hash is the original (unpatched) file blob. If patch apply fails, git tries to reconstruct an original unpatched tree using those hashes, applies the patch to it and goes for several classic merge strategies (since it now has 2 trees).

[przemratajczak]

try

git apply --whitespace=nowarn --reject *.patch

maby it is matter of whitespce, if not you will see how many and where are rejected hunks.