tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Thomas <>
Subject Re: svn commit: r1163802 - in /tomcat: tc7.0.x/trunk/java/org/apache/catalina/loader/ trunk/java/org/apache/catalina/loader/
Date Thu, 01 Sep 2011 10:57:14 GMT
On 31/08/2011 23:34, Konstantin Kolinko wrote:
> We already did such updates to trunk+branch when working on 6.0.x and
> I prefer to keep this practice.

Committing to trunk and 7.0.x at the same time may also cause
complications if we want to merge the patch back to 6.0.x. 5.5.x is less
on an issue since the different structure almost always means a manual
merge any way.

I continue to think that the simplest way to handle this is as we have
been doing.

Commit to trunk
Merge trunk -> 7.0.x unless trunk specific
Merge trunk -> 6.0.x if required
Merge trunk -> 5.5.x if required (may be manual)


To unsubscribe, e-mail:
For additional commands, e-mail:

View raw message