Re: Branch & Merge strategies

[Jakob Hummes]

Paul Sander wrote:
> 
> Brad Appleton is collecting articles documenting best SCM practices.  Take a
> look at this URL:
> 
> http://www.enteract.com/~bradapp/acme/

Yes, and they are really readworthy.

Additionally, there's a mailing list about the patterns Brad describes
on the ACME web site: scm-patterns.

I started a thread there a week ago (and actually on this cvs list,
too): 
"Codeline organization (branches) for medium/big projects"

While I got answers or at least started a discussion on the scm mailing
list, unfortunatley people on this cvs mailing list didn't jump on the
thread.

Basically, posters from the scm mailing list advised me to not use CVS,
but other CM systems, because CVS (apparently) lacks a good merge
command, while it is supporting branching very well.

If someone comes up with a solution to the original problem using CVS, I
would be very grateful, if she could share it with the whole list.  I
also will post a solution, should I see one.

Regards,
- Jakob