-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 20/12/2014 9:44 p.m., Amos Jeffries wrote: > With the hint of Markus recent patch containing tab indentation, I > have looked at why our sourcemaintenance script did not already > clean it up. > > It turns out there was a triplet of bugs which on the new Ubuntu > server are combining to mean astyle 2.03 made almost none of the > changes which it should have been for the last several months. > (ouch!) > > Updating the astyle version to 2.04 plus bug fixes to our scripts > resolves all these issues. It also resolves some very old > stylistic things we have been working around in the 1.23 version > for years. > > Please be prepared for a large speed-bump patch from source > maintenance on the next enforcement scan. > > I am not sure what rev. number we will be up to at the time, I'll > call it $N for now.
There we go. It has happened. On 21/12/2014 1:14 a.m., Cron Daemon wrote: > Committed revision 13776. So: > > You can update branches incrementally like so to avoid conflict > worries: > > bzr merge -r 13775 # fix any merge conflicts as normal bzr commit > -m "Merged from trunk rev.$N-1" > > bzr merge -c 13776 bzr resolve --take-this # run > ./scripts/sourcemaintenance.sh yourself bzr commit > > Then possibly bzr merge again for importing further trunk changes. > Amos -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (MingW32) iQEcBAEBAgAGBQJUlYFAAAoJELJo5wb/XPRjiTMIANHjJwNZF+VIMgayKxBtQQv8 FAZIg/0G/qgjVoFg/RF/K9BzNyKnmO8EpXaFx5DACK9fRTPOx6H0RMgymlTzRgJu PPbxWS7+aaX4t1ngu7dwNpFHjO6gYlp3wXj5yohQv+5JHBsek1aTqOi4EfTPd7dV q5qglzY4Z9G/lNXVgWok25Ct2gF8mMPK2QKWA0/nQFBWjS27x/6Est1SAp3TQ37k oKlK1FipFB99HvBZnkpPKYIoDGpJRN0+Jq1w98BBCA36d73sk0m8JXPkN0X/rzvQ Xcd6W3R3hBji3JITO53mU8XNyMyuJq5q4hwvAS4lSJbna+BD5aMlBwswGkCwNr0= =SlPu -----END PGP SIGNATURE----- _______________________________________________ squid-dev mailing list squid-dev@lists.squid-cache.org http://lists.squid-cache.org/listinfo/squid-dev