Re: [jira] Resolved: (DERBY-1489) Provide ALTER TABLE DROP COLUMN functionality

[Tim Dudgeon <td...@informaticsmatters.com>]

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
> 
> 

Re: [jira] Resolved: (DERBY-1489) Provide ALTER TABLE DROP COLUMN functionality

[Tim Dudgeon <td...@informaticsmatters.com>]

That could be it - I'm on Linux.
I'll try build from svn first.


Tim

Bryan Pendleton wrote:
>> I downloaded the 10.2.1.6 sources, and tried to apply the path to those.
>> patch -p0 < drop_column_v8_restored_tests.diff
> 
> That seems like a reasonable technique. I tried a similar, but not 
> identical,
> experiment: I took my 10.2 svn sandbox, and I ran patch -p0 <drop_...diff
> and it seemed to work fine, although I got a few "offset 10 lines" 
> messages.
> 
> I just tried some experiments with the sources from the download zip site
> http://db.apache.org/derby/releases/release-10.2.1.6.cgi
> and I think the problem may have to do with line-end characters.
> 
> Are you working on a Windows system or on a Unix system?
> 
> The files in the source release appear to have DOS line end characters and
> that seems to confuse the patch program.
> 
> Here's three suggestions:
> 1) Pull a svn client of the 10.2 branch and apply the patches to that. I've
> done it and I believe it works. Plus, that will make it easier for you to
> manage the patch process down the road with subsequent releases of the 
> 10.2 branch
> 2) If you're on a Unix system, try grabbing the sources and patching them
> on a Windows system. The line end characters may not be a problem then.
> 3) Use a tool to convert the line end characters of the files needing to be
> patched from DOS format to Unix format, then try applying the patch.
> 
> Meanwhile, I'll ask separately on the developer's list about line end 
> characters
> in the source distributions.
> 
> thanks,
> 
> bryan
> 
> 
> 
> 

Re: [jira] Resolved: (DERBY-1489) Provide ALTER TABLE DROP COLUMN functionality

[Bryan Pendleton <bp...@amberpoint.com>]

> I downloaded the 10.2.1.6 sources, and tried to apply the path to those. 
> 
> patch -p0 < drop_column_v8_restored_tests.diff

That seems like a reasonable technique. I tried a similar, but not identical,
experiment: I took my 10.2 svn sandbox, and I ran patch -p0 <drop_...diff
and it seemed to work fine, although I got a few "offset 10 lines" messages.

I just tried some experiments with the sources from the download zip site
http://db.apache.org/derby/releases/release-10.2.1.6.cgi
and I think the problem may have to do with line-end characters.

Are you working on a Windows system or on a Unix system?

The files in the source release appear to have DOS line end characters and
that seems to confuse the patch program.

Here's three suggestions:
1) Pull a svn client of the 10.2 branch and apply the patches to that. I've
done it and I believe it works. Plus, that will make it easier for you to
manage the patch process down the road with subsequent releases of the 10.2 branch
2) If you're on a Unix system, try grabbing the sources and patching them
on a Windows system. The line end characters may not be a problem then.
3) Use a tool to convert the line end characters of the files needing to be
patched from DOS format to Unix format, then try applying the patch.

Meanwhile, I'll ask separately on the developer's list about line end characters
in the source distributions.

thanks,

bryan