> > > I like the special-casing of the error for lock comment vs. log message, > but such changes that are unrelated to what you're doing on the branch > should really be done on trunk, it makes the merge review a little easier > later on. > > I fully agree, but I'd prefer to first try this in the branch, then commit such changes one-by-one.
-- Timofei Zhakov