2011-07-06, 13:34
djon:
I'm not very experienced with git, but I suggest you to forget about TortoiseGit and all stuff like that and start to use the command line... Right-click on your xbmc folder, select "Git Bash Here" and then apply the .diff using command line like:
diff -p1 <../[path_to].diff
Maybe the merging will not be clean, but you will see it failing for some points. In this case you will have *.rej files containing the merges which have been rejected. Then you will need to manually fix the source code. Depending on the age of the source code you are applying the patch this might turn out to be a tricky job.
I'm not very experienced with git, but I suggest you to forget about TortoiseGit and all stuff like that and start to use the command line... Right-click on your xbmc folder, select "Git Bash Here" and then apply the .diff using command line like:
diff -p1 <../[path_to].diff
Maybe the merging will not be clean, but you will see it failing for some points. In this case you will have *.rej files containing the merges which have been rejected. Then you will need to manually fix the source code. Depending on the age of the source code you are applying the patch this might turn out to be a tricky job.