The soul is dyed the color of its thoughts. Think only on those things that are in line with your principles and can bear the light of day. The content of your character is your choice. Day by day, what you do is who you become. Your integrity is your destiny - it is the light that guides your way. - Heraclitus
Shouldn't the VCS tell you exactly this?
[OCP 17 book] | [OCP 11 book] | [OCA 8 book] [OCP 8 book] [Practice tests book] [Blog] [JavaRanch FAQ] [How To Ask Questions] [Book Promos]
Other Certs: SCEA Part 1, Part 2 & 3, Core Spring 3, TOGAF part 1 and part 2
Originally posted by Ulf Dittmer:
Wouldn't this become more and more laborious as the branch deviates from the trunk?
Originally posted by Ulf Dittmer:
Or are you suggesting letting CVS do the merge
I guess the question then is: do people here actually do this for maintaining branches on a regular basis?
Run "merge" in the CVS, check all locations the CVS flags as "can't-reconcile-on-my-own" and fix by hand, and commit the merged files to the branch? Wouldn't this become more and more laborious as the branch deviates from the trunk?
Yes, but as Ernest already pointed out, that's not specific to using the automated merge feature. Manually porting fixes between branches will also become more and more laborious over time.
The trick is to only have (relatively) short living branches.
I always had the impression that CVS doesn't like having files copied to its checkout directory so that you can run a diff or merge - it usually complains about files not being up-to-date, and then refuses to commit the merges. Or maybe that's just because I don't know the ins and outs of CVS well enough.
Sorry, I have no idea what you are talking about, just the diffuse feeling that you might not use CVS the way it is supposed to be used.
What files are you copying to where for what reason?
And, what is your motivation for branching?
The soul is dyed the color of its thoughts. Think only on those things that are in line with your principles and can bear the light of day. The content of your character is your choice. Day by day, what you do is who you become. Your integrity is your destiny - it is the light that guides your way. - Heraclitus
The soul is dyed the color of its thoughts. Think only on those things that are in line with your principles and can bear the light of day. The content of your character is your choice. Day by day, what you do is who you become. Your integrity is your destiny - it is the light that guides your way. - Heraclitus
The soul is dyed the color of its thoughts. Think only on those things that are in line with your principles and can bear the light of day. The content of your character is your choice. Day by day, what you do is who you become. Your integrity is your destiny - it is the light that guides your way. - Heraclitus
Originally posted by Balaji Loganathan:
its looks somewhat simillar to what you are talking about...like Old maintainance branch, new, trunk.
Originally posted by David O'Meara:
In comparison our team is currently 5, but has grown to 8 or so. The code base is several thousand classes, stored in CVS (on a Linux server) and we use a mixture of TortoiseCVS and Eclipse as clients, mostly through Eclipse though.
We have a constant maintenance/bug fix/minor enhancement stream working on a main branch, and we always create a separate branch for major work orders and merge it back (Using Eclipse) once completed.
The only real issue (besides the deletion/rename/move already mentioned) was the CVS tage, $Log$, Author etc. They were a nightmare and we eventually had to scrap them all. If you use them they are wonderful when used in a single branch, but they tend to snowball out of control when used between multiple branches.
The soul is dyed the color of its thoughts. Think only on those things that are in line with your principles and can bear the light of day. The content of your character is your choice. Day by day, what you do is who you become. Your integrity is your destiny - it is the light that guides your way. - Heraclitus
With a little knowledge, a cast iron skillet is non-stick and lasts a lifetime. |