29 Mar
2011
29 Mar
'11
6:07 a.m.
I found some patches that I think have not been merged
into svn.
What is the best way for me to check whether a patch has already been
merged into svn? Is there a smart/efficient/programmtic way to do this?
Usually I go to the websvn for the file in question, pull the latest copy
of it, and visually inspect any lines the patch should have added to the
source code. If they are present in the websvn, then I assume the patch
has already been applied.
A more programmatic way would be to attempt to apply the patches to a
local SVN copy. Those which are already in SVN will error out with a
"reverse patch detected" or similar error.
Hope this helps!
Tim