You may find the patch application less restrictive as to what it applies to. IE, just run 'patch -p0 <file' and it should apply it, and then you can commit it.
The downside is that you lose information for creating, etc., so you can use --author along with commit.
source share