Re: [DUG]: Version Control

[Corey Murtagh]

----- Original Message ----- From: Paul Mckenzie To: Multiple recipients of list delphi Sent: Monday, November 04, 2002 8:53 AM Subject: [DUG]: Version Control This is possibly a bit off-topic !   Having just done major release we are re-looking at our version control...   Is there a better way of maintaining development and production source code ? What we are doing is Branching and putting any "Production" bug-fixes into both branches and "Development" stuff into the Development Branch only. There is scope for errors (leaving out a bug-fix or putting in two different bug-fixes, etc)   Any ideas, thoughts, what we do's, what we should do's much appreciated...  I've been using cvs for a while now (using WinCVS to simplify things) for my BCB source, and recently I've been investigating the Branch handling.  It seems you can do all sorts of fun things with CVS like merge between branches, etc.  In theory, although I haven't tried it, that means you can fork your source into any number of branches and merge changes back into the main branch on a file-by-file or project-at-once basis.  That means you don't have to manually replicate bugfixes... although you may have to manually solve merge conflicts that cvs isn't bright enough to do by itself.   Ultimately though it still comes down to having a decent source documenting process for each branch.  You need to track exactly what has been patched where so that you can later track missing bugfixes in the root branch.   -- Corey Murtagh The Electric Monk "Quidquid latine dictum sit, altum viditur."