[Adium-devl] SoC Merging

[Augie Fackler]

Hey all,

In light of the recent "pencils down" for SoC, I'd like to figure out  
a schedule for when to do merges. I'd like to merge bonjour first, as  
I think it'll have the fewest conflicts and be the easiest to get  
running.

After that, I'm not sure who should merge next. If I don't hear any  
other recommendations, I'm thinking the order will be multi-user  
chat, snapping groups, and then applescript. My fear is that the  
other branches might introduce changes that applescript needs to  
handle, so I'd like to deal with that before merging it to trunk.

FYI, here's the procedure to merge a branch back to trunk:
1) Merge all changes made on trunk since the last mergepoint to the  
branch
2) Resolve any conflicts (can be done interactively if you build svn  
1.5, a huge time saver)
3) Commit, bringing the in-repo branch up to trunk
4) Merge from the branch to trunk
5) Resolve conflicts
6) commit, bringing all of the branch changes onto trunk in the repo

Note that before both commit steps you should make sure the project  
builds and the app runs. If anyone wants my patch for svn that  
launches FileMerge on merge conflicts, let me know. It requires svn  
trunk, and it saves a *ton* of time for doing merges like this.

Any objections to me running a merge of bonjour tomorrow? I have 5  
hours in a computer lab that I can't do much of anything...

Peace,
Augie