[
https://issues.apache.org/jira/browse/DERBY-1400?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13432733#comment-13432733
]
Kathey Marsden commented on DERBY-1400:
---------------------------------------
so svn merge with -x -b seems to work great after the reformat of DERBY-5896.
Merging to 10.9 with the command below merges cleanly. The new lines of course
have spaces vs the old tab format but that is typical practice for a lot of
changes anyway.
$svn merge -x -b -c 1371677
https://svn.apache.org/repos/asf/db/derby/code/trunk
> Cleanup code in network server's DRDAStatement class
> ----------------------------------------------------
>
> Key: DERBY-1400
> URL: https://issues.apache.org/jira/browse/DERBY-1400
> Project: Derby
> Issue Type: Improvement
> Components: Network Server
> Affects Versions: 10.1.3.1, 10.2.1.6
> Reporter: Deepa Remesh
> Assignee: Kathey Marsden
> Priority: Trivial
> Attachments: DERBY-1400.diff, derby-1400_diff.txt
>
>
> The following cleanup tasks were identified as part of DERBY-1002
> (http://issues.apache.org/jira/browse/DERBY-1002):
> * pkgcnstkn, pkgid, pkgsn variables can be removed from DRDAStatement since
> these are derived from pkgnamcsn object.
> * Look into what is required by initialize() of default statement. Currently,
> initialize just calls setTypDefValues(). Once the purpose of this method is
> confirmed, we may need to modify the comments at places it is currently
> called.
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
