On 31/08/2011 22:57, Konstantin Kolinko wrote: > 2011/9/1 Mark Thomas <[email protected]>: >> On 31/08/2011 21:35, [email protected] wrote: >>> Author: slaurent >>> Date: Wed Aug 31 20:35:22 2011 >>> New Revision: 1163802 >>> >>> URL: http://svn.apache.org/viewvc?rev=1163802&view=rev >>> Log: >>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51741 >>> bug 51741: Eclipse WTP "Serve modules without publishing" broken with tc7, >>> needs patch in tomcat >> >> This should have been applied just to /trunk and then merged to 7.0.x/trunk. >> > > This Sylvain's commit patches both trunk and 7.0.x at the same time. > Thus there is no need to merge.
I know what the patch did. The point is that committing like this messes with the mergeinfo. It may (or may not) cause us some headaches at some point in the future. Given we don't have to commit trunk and 7.0.x/trunk together, I'd rather we continued with the current practise of trunk first and then merge. Mark --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
