Fun With Branches

I’ve been having fun with branches today. No, not the tree kind, CVS branches: parallel branches of code development. I’ve got to bring together several branches of development (five in fact) in order to do a new release of code. Quite a complex job. I spent quite a while just getting my head around what was where and what was going to be merged with what, and in what order.
The resultant diagram looks like this (reduced in size and details removed).
CVS Branches

1 thought on “Fun With Branches

  1. Looks eminently manageable to me, Mike, and certainly not beyond you. However, we’ve been well prepared in our experience. I’ve only recently realised that the Jellyish Project was so-called because its CVS diagram is representative of a submersed mish-mash of tentacles with a sting that hurt!

Leave a Reply

Your email address will not be published.

This site uses Akismet to reduce spam. Learn how your comment data is processed.