[
https://issues.apache.org/jira/browse/DERBY-2312?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#action_12477472
]
Andrew McIntyre commented on DERBY-2312:
----------------------------------------
Hi Manjula, the _ver2 patch has a merge marker in it:
+<<<<<<< .mine
+ Datatypes.Rn = rand;
+ // harder to actually delete rows when there are
+ // more connections, so repeat operation more often
+=======
//harder to actually delete rows when there are
//more connections, so repeat operation more often
+>>>>>>> .r513939
Please resolve this merge and post an updated patch. You can check for
unresolved conflicts in your checkout by looking for files with 'C' status when
running svn stat.
> Remove unwanted prints generated by the test
> --------------------------------------------
>
> Key: DERBY-2312
> URL: https://issues.apache.org/jira/browse/DERBY-2312
> Project: Derby
> Issue Type: Sub-task
> Components: Test
> Affects Versions: 10.3.0.0
> Reporter: Manjula Kutty
> Assigned To: Manjula Kutty
> Priority: Minor
> Fix For: 10.3.0.0
>
> Attachments: DERBY-2312_diff.txt, DERBY-2312_diff_ver2.txt,
> DERBY-2312_stat.txt
>
>
> Remove unwanted prints generated by the test.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.
