[Top][All Lists]

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

Re: cvs update with a tag

From: Kaz Kylheku
Subject: Re: cvs update with a tag
Date: Tue, 18 Sep 2001 19:09:30 GMT
User-agent: slrn/ (Linux)

In article <address@hidden>, Kostur, Andre wrote:
>This message is in MIME format. Since your mail reader does not understand
>this format, some or all of this message may not be legible.
>Content-Type: text/plain;
>       charset="iso-8859-1"
>There seems to be an oddity when updating with a tag (in my case, branch).
>Let's presume that I have a directory of 40 files, only 5 of which are on a
>cvs update -f -r Branch
>to update all files from the repository, the 5 on the branch being at that
>revision level, the remaining 35 all at the HEAD.  At least that's the
>intention.  What I seemed to end up with is the 5 on the branch being
>correct, and the other 35 claiming to have that tag, but not really.  As a
>result when I go and "cvs commit" one of the 35 files, CVS complains that
>the file isn't up-to-date.

That sounds like a simple up-to-date check failure. This happens
when you try to commit changes, but someone else has also commited
changes. You need to synchronize with their changes by doing an update,
resolve any conflicts and try the commit again.

>Where's my error?

Your error is in following dubious version control practices, such
as branching some files but not others, within the same directory.

This can be pulled off, but it's not a sustainable practice.  At the
very least, you should branch at the directory or module level. It's
possible to do ``lazy branching'', whereby you branch only a part of
the project. You work on the branch on some of your files, integrating
with non-branched versions of other files.  You can gradually add other
files to the branch, by branching them using the same branch tag, until
you end up with a complete branch that includes all the files. In other
words, branching doesn't have to be done all at once; you can get away
with doing it incrementally.

This kind of thing works best on a private branch that only one developer
knows about. It's not going to work well if the branch is to be used by
many developers; you really need to branch the whole project.

><META HTTP-EQUIV=3D"Content-Type" CONTENT=3D"text/html; =

Don't post HTML crap to Usenet discussion newsgroups or mailing lists!

reply via email to

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