Mergings

[Long Doan]

Dear All,

I have been reading all these messages about merges, so I figure I'd put my
own .02 in...
First off, I have no experiences running merges under CVS, so my comments
might be completely invalid. In that case, simply ignore them. I have,
however, done quite a few branch/merges under other source control systems
such as Perforce and ClearCase.

In my experience, it makes the merges a lot easier if the development branch
is keep up-to-date with the main branch. The intention is, after all, to
merge the development branch back. So, instead of doing a whole-sale merge
from samba_tng into samba, it might be easier to periodically merge samba
into samba_tng to keep _tng somewhat in line with the main line. Then
samba_tng can be merged back to the main line without much hassles when it
is appropriate.

Just my 0.02.
Long.

Long Doan
Senior Software Engineer
KnowledgePlanet.com
703-262-6610
ldoan at knowledgeplanet.com