[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: CVS files merging procedure

From: Russ Sherk
Subject: Re: CVS files merging procedure
Date: Sun, 11 Dec 2005 23:50:27 -0500

On 12/10/05, Jim Hyslop <address@hidden> wrote:
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.

Agree'd programmers should check in code.  There are some reasons to have a 'cvs administrator' that checks what is checked in  (conforms to company standards, will not break build, does not contain obvious errors...).  The administrator, if needed, should not check in others code. 

Hmm... now that I think of it, this is exactly what Linus T. does/did: the comunity submitted patches and Linus vetoed/ok'd them and checked them in.  He used Bitkeeper though. They have recently moved to another system altogether now (seem to remember a /. article or something.).

Oh.  Now I see.  That particular mode of operation does not fit cvs (or subversion).  See this article 'Please stop trying to get Linus to use Subversion' and Linus'  'SCM saga..." from the kernel mailing list:

If you have to work like this (because of policy or geography etc.) maybe you need to re-think your SCM plan (i.e. CVS may not be the solution for you.)  If it is because of politics and/or you have already made a significant investment in CVS (time/effort etc.) and you want to stick with it, you'll probably have to re-think how you will use CVS (as the other posters have stated).

Good luck.  All the best.


Damn it all to hell! I forgot my sigline.  I thought of a great one today in the shower.  I knew I should have wrote it down.  Poop on a stick.  It was really good too.  Oh well.

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.
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird -


Info-cvs mailing list

reply via email to

[Prev in Thread] Current Thread [Next in Thread]