Small patch, replaces the deprecated 'junit.framework' with the newer 'org.junit' import statements.
I cannot get it to apply:
$ git am -3 --ignore-whitespace --signoff ~/Downloads/0001-Replacing-old-junit-imports.patch
Applying: Replacing old junit imports.
fatal: sha1 information is lacking or useless (src/test/org/openscience/cdk/smsd/IsomorphismTest.java).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Replacing old junit imports.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
Does this require the SMSD patch first?
Fixed - Yeah I did it on the SMSD branch as I spotted some in the SMSD code. This was for the existing code though so heres the patch for master.
Log in to post a comment.