[squid-dev] NOTICE: astyle brokenness

Amos Jeffries squid3 at treenet.co.nz
Sat Dec 20 08:44:49 UTC 2014


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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.

You can update branches incrementally like so to avoid conflict worries:

  bzr merge -r $N-1
  # fix any merge conflicts as normal
  bzr commit -m "Merged from trunk rev.$N-1"

  bzr merge -c $N
  bzr resolve --take-this
  # run ./scripts/sourcemaintenance.sh yourself
  bzr commit

Then possibly bzr merge again for importing further trunk changes.

HTH
Amos
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (MingW32)

iQEcBAEBAgAGBQJUlTcAAAoJELJo5wb/XPRjcr0IAJ7oq5r/SVIQ0ZFNsLpk7tCZ
PM2ePj6CX1nGaay8x2YRq8TWqAtHcPUu4ZF2AZk2+YZbXxpS7rmD+8WGHvylbswG
9sjfq9ajbN8rnhCkEmKY69cHonlntMrGMEcJOTjjO8ESfHMgPyX3cONTCjlzPTZc
6My1s5ct28njd4dyO+BGCRQSI7BKUyebVK4gV5O1jXPNSS9LA7Yo0kp6RxlnqFV4
Ccr4WCuVsXyu9bEz1b+SJHbJn0u9BzwhV3uTiKvZgjL1FdR20H9ADw8VfoueYXOe
BghmmHau56Fgj/B+1v8fIvUKvZYq0++TP1DWMSPII9GECPKr8D6WQ5WE7cKqIc4=
=JIyC
-----END PGP SIGNATURE-----


More information about the squid-dev mailing list