[prog] CVS travails, and strategies

[Jimen Ching]

On Tue, 9 Sep 2003, Michelle Murrain wrote:
>Now to the philosophy question - Is it better (easier) to use the trunk
>for bugfixes, or the branch? I'm getting the impression that merging
>files isn't anywhere near as automagically nice as I must have thought,
>because I don't get why features that weren't part of the areas of
>bugfixes would get wiped out, instead of merged. And files that I'd
>added to the branch got removed. I think I'm missing something in what a
>branch is vs what the trunk is.

I believe the accepted approach (for any version control software), is to
use the trunk for development and branch stable releases.  From following
GCC development, I didn't notice any automatic merging between stable and
trunk.  Most people when they want to put a fix into both paths, they have
to check-in to each individually.

Merging isn't a problem as long as there aren't any conflicts.  But if
there are, then there's nothing that can help you.  :(

--jc
-- 
Jimen Ching (WH6BRR)      jching at flex.com     wh6brr at uhm.ampr.org