I have two files - fileWithMyFix.c and fileCustUpdated.c. I made my fixes to filewithmyfix but was not aware that a customer was updating the same file to make other (unrelated changes).
I need to push my changes into their file. A flat patch doesn't seem to be working, since there are differences in both files. If I diff them and apply that patch, it tries to revert fileCustUpdated.c to match fileWithMyFix, but ends up creating a mess.
Is there a way to pinpoint specific portions of the file to patch? Do I have to diff fileWithMyFix.c against an untouched file fresh off svn, and then apply the patch that way? I figure line numbers won't line up and there will be issues there as well.
Edit - I may have been doing the diff backwards, but I let it do the reversion and it applied the patch correctly. New question - which way do I do the diff to avoid this?