db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Andrew McIntyre" <mcintyr...@gmail.com>
Subject Re: [jira] Commented: (DERBY-883) Enhance GROUP BY clause to support expressions instead of just column references.
Date Wed, 09 Aug 2006 23:01:56 GMT
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

Mime
View raw message