I downloaded the 10.2.1.6 sources, and tried to apply the path to those.
e.g.
patch -p0 < drop_column_v8_restored_tests.diff
I'm no expert here, so am probably doing it all wrong :-(
Tim
Bryan Pendleton wrote:
Tim Dudgeon wrote:
I'm wanting to apply this patch (_v8_) to the 10.2.1.6 sources (the
latest released version). But applying the patch to these sources fails.
Hi Tim,
I'm not sure what process you used to apply the patch to your sources.
Did you follow the scheme outlined in
http://wiki.apache.org/db-derby/MoveAChangeBetweenBranches
In this case, I think the command to use is:
svn merge -r 453419:453420
https://svn.apache.org/repos/asf/db/derby/code/trunk/
I just tried this, and the patch appeared to merge back to the 10.2
codeline
without complaint and the resulting build was clean (I didn't run any
tests,
just verified that I could build the code and the svn diff looked
reasonable).
Note that you issue this command with your current directory set to your
10.2 sandbox.
Hope this helps, and please let us know your experiences with the
modified code!
thanks,
bryan
