Re: CVS files merging procedure

[Jim Hyslop]

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

abhay mehta wrote:
> 2. Is there any problem is merging procedure

Yes. Every step of your procedure is a problem.

Never rely solely on timestamps. Use tags and branches instead.

All commits *MUST* be done *from the same directory where they were
checked out*. Never, ever send files to someone else to commit. This
means your programmers *must* be allowed to check into the repository.

Keep in mind that forcing all checkins to go through your administrator
will create a bottleneck. As Damian and Dennis have pointed out, CVS is
designed to allow concurrent work. I strongly suggest you let your
programmers check in the code themselves.

This brings us to the question: why does your administrator check in the
code? Is it because your programmers do not know how to merge,
because your procedures require only one person to check in the source,
or some other reason? Before we can recommend a procedure, we need to
know what your needs and goals are.

- --
Jim Hyslop
Dreampossible: Better software. Simply.     http://www.dreampossible.ca
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDmwuzLdDyDwyJw+MRAqXZAJ9pdr4IO89bq4DYwD3eDnazgi4oywCgxo8x
+mpP2MHBt+LRgcBrVEjWuRM=
=iXsl
-----END PGP SIGNATURE-----