Pavel Roskin <[EMAIL PROTECTED]> wrote:

>So, you are suggesting "cvs checkin" as a way to move sources from one
>machine to another? That's interesting.


This is what we do, and it works really well.  We also use it for
copying files from one developer to another.

Previously, we would occasionally have problems with people copying
files around, in that we would lose track of which directory had
the "best" files, or sometimes when one directory would have the
best copy of one file and another directory the best copy of
another file.

In addition, we have a very excellent multi-site, multi-media
backup system for our repository.  So any changes which are
committed are very safe.  Therefore we encourge developers to
commit at any time they have something which they would not
like to lose.

Instead of the rule "commit only working code" we have tagging
conventions to tag good versions of code.  So you can check in
a good version, tag it with the "stable" tag, and then check
in non-working versions over that with no worry.  The only
rule is that you have to be very careful with the "stable"
tag, since that is what the buildmaster checks out.

Our files/directories are arranged in such a way that usually,
if two people need to modify the same version of a file, they are
working on a project together.  So we have not had a lot of
problem with merging and resolving conflicts.

I've been using CVS for about 7 years, and this strategy has
evolved over that time, and seems to work pretty well, at least
for us.

HTH,
Mark.

--
Mark Harrison                         http://usai.asiainfo.com:8080/
AsiaInfo Computer Networks            [EMAIL PROTECTED]
Beijing, China / Santa Clara, CA      http://www.markharrison.net/


Reply via email to