28-02-2006, 17:44
|
 |
 |
Electrical Engineer / Computer Geek
AKA: Eldarion Telcontar
no team (Teamless Orphan)
Team Role: Alumni
|
|
Join Date: Nov 2005
Rookie Year: 2005
Location: Númenor
Posts: 558
|
|
|
Re: How do you manage code changes?
Quote:
|
Originally Posted by Keith Watson
I used cvs (including scripts written on top of cvs) for many, many years. We did not use branches very often. More than 95% of our stuff was done on the mainline. Branching is best used when you need to do isolated development with version control while the mainline goes through several revisions.
If you use TortoiseCVS check the User's Guide, it's simple. If you use a flavor of regular cvs look for "cvs update -j branchname". This means "join the branch to the mainline". Here is some documentation on Branching and Merging. |
Thaks for the links. For some reason I was finding it difficult to locate CVS documentation. 
__________________
CMUCam not working? Tracks sporadically? Try this instead: http://www.falconir.com!
PM me for more information if you are interested (it's open source!).
Want the FIRST Email blasts? See here: http://www.chiefdelphi.com/forums/sh...ad.php?t=50809
"The harder the conflict, the more glorious the triumph. What we obtain too cheaply, we esteem too lightly; it is dearness only that gives everything its value."
-- Thomas Paine
If it's falling apart it's a mechanical problem. If it's spewing smoke it's a electrical problem.
If it's rampaging around destroying things it's a programming problem.
"All technology is run on 'Magic Smoke' contained within the device. As everyone knows, whenever the magic smoke is released, the device ceases to function."
-- Anonymous
I currently speak: English, some German, Verilog, x86 and 8051 Assembler, C, C++, VB, VB.NET, ASP, PHP, HTML, UNIX and SQL 
|