[Adium-devl] Caution: Merge Left

[Colin Barrett]

On Nov 18, 2006, at 4:22 AM, Peter Hosey wrote:

> On Nov 18, 2006, at 05:12:23, Colin Barrett wrote:
>> How much testing have you done of 18245? all the other revisions  
>> look fine to me.
>
> I tested it on both the hypahrat log and a smaller log created (in  
> Adium) for testing. The former is AIM, as those of us who've seen it  
> know, and the latter is Jabber. Works fine in both cases.
>
>> I was going to suggest waiting for svn 1.5 to merge project  
>> parallelization (mmm, cherry picking), but … I think it's a bit of  
>> a ways off.
>
> What does it have over 1.4?

Well, svn finally has merge tracking. I'd explain it, but the svn  
team's already done that for me :) http://subversion.tigris.org/merge-tracking/

If you don't know anything about merge tracking and why it's important  
here's a super quick summary: it's additional metadata about what  
changes have been merged and when. This allows more advanced merge  
algorithms.

>> HOLD [18096] (remove version.plist). We don't want to break pre- 
>> sparkle clients for a major release like this!
>
> The PP merge is only for trunk. 1.0 branch won't get it.

Oh, right right. I assumed branch for some reason.

>> Question: Are the headers for Adium.framework and  
>> AIUtilities.framework still included? If not, those should be  
>> turned on for release builds, IMO. Shipping frameworks with headers  
>> on for frameworks we intend people to use seems like a Good Thing  
>> to do. The cost in terms of binary size may outweigh this Good  
>> Samaritan benefit though.
>
> I only removed those from plug-ins and the app — things for which  
> copying headers into it has no reasonable purpose. Headers are still  
> copied into the framework and rm'd after copying the framework.
>
>> Just as a further test, it would be interesting to see how much  
>> time is saved on a build where no changes have been made …
>
> It's actually slower.
>
> trunk:
> xcodebuild -configuration Deployment  7.00s user 2.33s system 114%  
> cpu 8.117 total
> pp:
> xcodebuild -configuration Deployment  7.03s user 1.91s system 79%  
> cpu 11.274 total
>
> No idea why.
> ________________________________
> \ Peter Hosey / prh at boredzo.org
> PGP public key ID: 7AB26BAD (since 2006-01-01)
>
> _______________________________________________
> Adium-devl mailing list
> Adium-devl at adiumx.com
> http://adiumx.com/mailman/listinfo/adium-devl_adiumx.com