On 8/9/06, Daniel John Debrunner (JIRA) <derby-dev@db.apache.org> wrote:
[ http://issues.apache.org/jira/browse/DERBY-883?page=comments#action_12427050 ]Daniel John Debrunner commented on DERBY-883: --------------------------------------------- Darn - this patch doesn't apply cleanly for me, about 8-10 files have conflicts, otherwise I would have committed it.
Don't forget, svn is smarter than patch when it comes to conflicts. Usually you can go back to the revision the patch was created at, apply the patch, and roll forward to the head and svn will merge the changes properly. So, try: svn up -r 425465 patch -p0 < 883.patch5.txt svn up andrew
