db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel John Debrunner <...@debrunners.com>
Subject Re: [jira] Updated: (DERBY-518) Data type mismatch error for boolean to DECIMAL conversion in J2ME
Date Thu, 01 Sep 2005 16:51:47 GMT
Philip Wilder wrote:

> Just an update, applying the patch to the 10.1 stream gave a clean bill
> of health except for 2 failures:
> 1) A failure with lang/errorStream.java
> I'm confident this stems from DERBY-459
> (http://issues.apache.org/jira/browse/DERBY-459).
> 2) A intermittent failure with lang/logStream.java
> Less sure where this one comes from but I am confident that the problem
> isn't from my changes.
> Thus I'm ready to go ahead with the 10.1 port if I can convince anyone
> to do the commit..

Is this a port of a commit to the trunk or a simple merge?

Ideally changes should be merged between branches using svn merge,
not separate patches. This is to allow tracking of changes through svn.
I think this helps svn in future merges as it has a better idea of
common ancestor.

Thus a contributor should try out the merge and if that is successful
then the patch should be supplied as the merge command itself, that a
committer can run.

In the svn merge does has conflicts, then I'm not sure what the correct
approach should be. Keeping the tracking information is near essential,
so maybe the patch is the merge command and a subsequent patch.

I think this is a valid example of a merge from the trunk to 10.1,
where change 21245 is being merged. This is executed in the 10.1 client.

svn merge -r 21244:21245

(note 21245 may notbe a valid change for the trunk, I just made it up)


View raw message