db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "David W. Van Couvering" <David.Vancouver...@Sun.COM>
Subject Re: [jira] Updated: (DERBY-516) Need to incorporate client backward/forward compatibility testing into testing procedures.
Date Wed, 19 Oct 2005 23:31:16 GMT
I like to start by applying a patch to the revision level that the patch 
was built with.  That way I can make very sure I applied things 
correctly -- I can diff the output of svn status and svn diff with what 
the contributor provided.  This is especially important when the 
contribution includes files that are added (especially new empty files 
like empty test master files), which I actually have to add by hand.

Once that looks good, I do an svn update with no -r option to update the 
tree to the head of the trunk.  If at this point I get errors, then, 
yes, I would complain to the contributor, but I want to make sure I 
applied the patch correctly first.

Maybe that's not how everyone does it, but that's how I like to do it, 
so that's why I was suggesting the revision number.  I can also do it by 
date, but the revision number is more accurate.

Thanks,

David

Daniel John Debrunner wrote:
> David W. Van Couvering wrote:
> 
> 
>>No, that's it.  I think it would be a great habit for all of us to list
>>the svn info revision number along with the svn status when submitting a
>>patch.
> 
> 
>>>David W. Van Couvering wrote:
>>>
>>>
>>>>Thanks, Rick.  Can you add a comment with the SVN revision number of
>>>>your sandbox?  This helps me merge the patch into the right snapshot
>>>>of the codeline.
> 
> 
> I'm missing something here, patches should be merged into the latest
> version of a codeline, not an old version. If the patch doesn't merge
> cleanly then either the committer can figure it out, or they can bounce
> it back to the contributor to say please merge with the latest and
> re-submit. Getting the contributor to merge is the best approach, since
> they understand the code changes the best.
> 
> What are you trying to achieve by using an old codeline?
> 
> Dan.
> 
> 

Mime
View raw message