On Mar 24, 2010, at 4:35 PM, Graham Cox wrote:

> Thanks Eli (and Mike too, who voiced much the same opinion). I guess the term 
> 'fork' in my title was a bit misleading. The change isn't that radical. 
> Basically I want to add a major new feature but in the meantime make it 
> possible to release bugfixes if necessary before that new feature is ready to 
> go. Any bugfixes also need to apply to the new version as well, so a complete 
> fork is probably not appropriate.


Actually, a subversion branch is exactly what you want. Create a branch for 
your feature, do all the work on that branch, then merge it to the trunk when 
it's ready. Put your released product in a different branch and do your 
bugfixes on that branch and merge them to trunk. Don't work on trunk at all. 
except to integrate all merges in preparation for the next release. 

Don't try to ifdef your new feature into your main project; that's exactly 
wrong tool for the thing you should do and you have no idea how much you're 
going to regret it.

-- 
Dave Carrigan
d...@rudedog.org
Seattle, WA, USA

_______________________________________________

Cocoa-dev mailing list (Cocoa-dev@lists.apple.com)

Please do not post admin requests or moderator comments to the list.
Contact the moderators at cocoa-dev-admins(at)lists.apple.com

Help/Unsubscribe/Update your Subscription:
http://lists.apple.com/mailman/options/cocoa-dev/archive%40mail-archive.com

This email sent to arch...@mail-archive.com

Reply via email to