Back-porting versus brand-new patch

2012-08-13 Thread Christopher Schultz
All, Recently, I have made a proposal or to to back-port changes into Tomcat 6. In one case, Konstantin has (helpfully!) provided a new patch based upon several changes to trunk/TC7. In this case, is it more appropriate to apply the single patch to TC6 and ignore those patches made to trunk, or s

Re: Back-porting versus brand-new patch

2012-08-13 Thread Konstantin Kolinko
2012/8/13 Christopher Schultz : > All, > > Recently, I have made a proposal or to to back-port changes into Tomcat > 6. In one case, Konstantin has (helpfully!) provided a new patch based > upon several changes to trunk/TC7. > > In this case, is it more appropriate to apply the single patch to TC6

Re: Back-porting versus brand-new patch

2012-08-13 Thread Christopher Schultz
Konstantin, On 8/13/12 3:26 PM, Konstantin Kolinko wrote: > Regarding size of a patch: > > It is up to you. You do it in your own name. The lesser the patch the > lesser are chances to screw it. But if you feel that something needs > to be included as well, feel free to include it.

Re: Back-porting versus brand-new patch

2012-08-13 Thread Konstantin Kolinko
2012/8/14 Christopher Schultz : > >> 2. The "svn patch" command does not update mergeinfo, but mergeinfo >> can be updated explicitly by doing a "svn merge --record-only". > > Understood. I almost never do 'svn patch' but instead do 'svn merge'. I > didn't know that one could perform a record-only