On Mon, Aug 6, 2012 at 12:09 AM, Amos Jeffries <[email protected]> wrote: > On 06.08.2012 03:56, Kinkie wrote: >> >> On Sun, Aug 5, 2012 at 1:21 PM, Amos Jeffries <[email protected]> >> wrote: >>> >>> On 5/08/2012 12:22 a.m., Kinkie wrote: >>>> >>>> >>>> Hi, >>>> v2 addresses (or at least triest to) address all your suggestions, >>>> plus it changes DBG_CRITICAL and DBG_IMPORTANT across the whole >>>> source, >>> >>> >>> >>> Hmm. okay. I was only requesting the new added/modified lines for now. >>> The >>> source-wide should probably be done as a separate update which can be >>> ported >>> to 3.2 later. >> >> >> It should be possible to cherrypick that specific revision from the >> feature-branch, it's all done in one commit, or I can simply reproduce >> (it's a regex-replace in eclipse, after all) > > > Okay. Please do then. +10 on that by itself.
DEBUG_IMPORTANT is http://bazaar.launchpad.net/~kinkie/squid/fixme-fixes/revision/12240 DEBUG_CRITICAL is http://bazaar.launchpad.net/~kinkie/squid/fixme-fixes/revision/12241 Will cherrypick and merge to trunk asap. >>>> and changes CBDATA_CLASS* positions everywhere. >>> >>> >>> >>> Does Squid still build fine? Last time I tried to move one it failed to >>> build cleanly afterwards. I'm not entirely confident we have unit-test >>> coverage to test them all either. >> >> >> Yes, it does. They're just a few (half a dozen, maybe). Also, most are >> CBDATA_CLASS which don't play the same private: trickery as >> CBDATA_CLASS2. >> >>> Was only asking to mark them for later attention so they are easy to find >>> again. >> >> >> Whoops, I misunderstood. Should I revert? > > > Easy to cherrypick as well? Since you've already done the work I see no > reason not to merge it to trunk as a stand-alone commit just in case > anything goes badly afterwards. Should be. It's all here: http://bazaar.launchpad.net/~kinkie/squid/fixme-fixes/revision/12244 (you can even download an unified diff from launchpad, if all other cherrypicking fails..) -- /kinkie
