Hi,
Would just reply to active thread but just joined the list so can't. I was wondering if anyone else has had issues with getting the patches to work with git repository. I am currently getting the following message when I try to apply the patch.
iain-en1:gitrepos iain.cambridge$ patch a/cobbler/action_import.py seperate.diff patching file a/cobbler/action_import.py Reversed (or previously applied) patch detected! Assume -R? [n] y Hunk #3 FAILED at 859. Hunk #4 succeeded at 1156 (offset -4 lines). patch unexpectedly ends in middle of line Hunk #5 succeeded at 1166 with fuzz 2 (offset -4 lines). 1 out of 5 hunks FAILED -- saving rejects to file a/cobbler/action_import.py.rej
and when I try to use git's apply command
fatal: corrupt patch at line 74
Also any ETA on having this functionality merged into the master branch?
Thanks in advance.