Re: CVS files merging procedure

[Mark D. Baushke]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

abhay mehta <address@hidden> writes:

> Based on feedback from Jim, Russ Sherk and
> others, we reviewed our SCM plan. However based
> on our requirements, we need an Administrator/
> Reviewer to review the code before it goes to
> repository.

I suspect that you will NOT be happy with CVS as
your SCM. You really want a full-blown
transaction-based source control management
system. Look here for more information:
<URL:http://aegis.sourceforge.net/>

> This is very much required as we have number of
> programmers, who don't know the whole system and
> so the implications/ side-effects of their
> changes in other part of the system.

Education is your friend. If you train your
programmers, your productivity will probably
increase. Then your staff that does approval can
do other more meaningful work in addition to doing
some code reviews because the code will be much
closer to ready to commit when everyone
understands the constraints of the full system.

> With all your suggestions, I think using
> branches for individual working and commit may
> work. I will look at cvs_acls script also. I
> need to work on whole procedure again.

Yes, you do. Bear in mind that generating lots of
branches can get very confusing to users too.

You may want to use a tool like Aegis which is
designed for transaction based commits. So, a
programmer commits to the the first part of the
transaction and after approval the code is
promoted to the master sources. Aegis is an open
source SourceForge project.

        Good luck,
        -- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFDn9XPCg7APGsDnFERAjLAAKDfZp64g67zxRWcIBVZeJqfoB1OzgCgr6Tz
sQFqz8AodDQSPSZ0PGvoUxI=
=nBGg
-----END PGP SIGNATURE-----