[Adium-devl] Branching, and SoC Merge Plans

[David Smith]

	Hi everyone,

	I've been thinking about how to handle SoC project merging, and I  
have two thoughts;

	1) branch 1.0 after the last non-joscar regression is fixed. Because  
SoC involves no joscar changes, merges should be trivially easy for  
those fixes.
	2) Investigate the merge procedure carefully. GCC has been working  
on this, and their latest plans are here: http://gcc.gnu.org/ml/gcc/ 
2006-09/msg00454.html . The 72 hour checkin window seems sane to me.  
Merge a project, get some testing, reopen trunk 72 hours later for a  
day or two, then merge the next project.

	thoughts?

												David