[Zenoss-dev] Branch-Based Development

[Duncan McGreggor]

Hey guys,

As you will have noticed (if you read the Trac timeline), I goofed last 
week when I was trying to update my branch with some of the recent 
changes in trunk. It turned out there was no over-lap (none of the 
files I was working got updated by anyone else after I branched), so it 
was a non-issue.

However, when I went to merge my changes to trunk today, I had to brush 
up on my svn commands. It's been about a year since I did merging, and 
svn merging is a real PITA in this regard. It lacks smart merging of 
any kind, and you have to go through many steps and double check tons 
of shit.

As a result, I had started writing a series of scripts to do this, and 
then I smacked myself in the head -- the Twisted Python team (well, 
actually the twisted guys that are in Divmod -- Glyph, JP, etc.) have 
already done WAY more towards solving this than I could dream of doing 
in an evening (hell, in a week, for that matter!). Here's their 
solution:
   http://divmod.org/trac/wiki/CombinatorTutorial

It sounds like a lot of work, but it's actually not. I'll be using this 
to do dev work from now on. I'll get a procedure down, and then post it 
to the list or even put up some wiki pages on the approach/methodology.

The motivation for branch-based development is nicely laid out here, 
and is a good read:
   http://divmod.org/trac/wiki/UltimateQualityDevelopmentSystem

Have a great weekend, guys!

d