All,

One of the things I have noticed with the move to git is how easy it can
be to back-port commits. If there are no conflicts, a series of patches
can be back-ported with a few clicks. However, conflicts significantly
slow this process down. I'd like to improve that.

The short version of the plan is:

Align all three current code bases where it makes sense to do so.

The longer version of the plan is to tackle this over the medium to long
term with a combination of aligning files before making changes and
back-porting larger sets of changes.

There are a number of larger changes responsible for a reasonable chunk
of the differences. One of those is the switch to UTF-8 in the
LocalString*.properties files. I am therefore planning to back-port this
change to 8.5.x and 7.0.x.

I'm currently undecided what to do about the additional language support.

I will try and back-port the i18n improvements (mainly additional i18n
of messages).

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to