I've got some difficulty in understanding how to tag dead revisions
such that branch merges will work.
Consider this:
Initial state (version, tag):
1.3 LAST_MERGED
1.4 REL_1
Now merge on some branch:
cd branch...
cvs up -j LAST_MERGED -j REL_1
cvs rtag -F -r REL_1
Hi All,
We are trying to check-in the following characters into
CVS.
But while doing so, the highlighted characters get corrupt and upon checking
out, these are replaced by some other characters.
Sí
(means yes in Spanish)
Sì
(means yes in Italian)
Can anybody provide a
Hello,
just recently we had the problem that two people had checked out the
same module and were working on it independently. When the second one
committed his sources again, CVS reported an error (I can't reproduce it
100% here, sorry) about the sources not being up-to-date.
However, I
This is intentional by CVS. So here's the scenario
Person1 Person2 working on file1.c and hence have
a copy of the file in their respective sandbox.
Person1 checks-in file1.c, updating the repository copy.
Person2 checks in file1.c, CVS complains Your file is
out of date (or the like).
CVS automation kicked in for you. It recognized a concurrent change and
instructed you to update your local copy before checking in the changes.
Updating before checking in is a sound policy that avoids those errors.
Allows you to do a local integration test prior to checking in.
You just had a
Anyone?
--
Neil Watson
Network Administrator
www.voicegenie.com
___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs
The silence is telling: not a common problem. As you indicated the
problem is intermittent and not easily reproduced: the worst kind!
Could it be a buggy release? Maybe:
http://lists.gnu.org/archive/html/info-cvs/2004-10/msg00252.html
It is fixed in cvs 1.11.17.1 (will be in cvs 1.11.18) with
On Wed, Jun 15, 2005 at 10:59:57AM -0700, Rod Macpherson wrote:
Could it be a buggy release? Maybe:
http://lists.gnu.org/archive/html/info-cvs/2004-10/msg00252.html
It is fixed in cvs 1.11.17.1 (will be in cvs 1.11.18) with this patch:
It is vague but, I'm willing to try an upgrade. Are
I'd make a copy of your repository directory but my guess is there will
be no compatibility issues between your repository and new CVS binaries.
Just update the package and any dependencies using RPM. Not to say it
isn't the client, but you can upgrade those later.
-Original Message-
Alright, thanks a lot!
--
Matthias Kaeppler
___
Info-cvs mailing list
Info-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/info-cvs
Title: Message
Maninder,
CVS
does not support Unicode files, instead they must be committed as binary, in
which case you cannot do diff/merge etc.
CVSNT
on Mac/Linux/Unix/Windows (free, open source, GPL, just like CVS) does support
unicode files (-ku).
Please
supply more information
Hi Class!
Currently our CVS repo has 3 main separate projects running under it. By
default when I create a new unix user; I give them access to the whole
repository, however, some folks have been editing files in projects they
were not supposed to.
How can I ONLY and specifically create
Hi,
I am using a Linux server to maintian a package with CVS, other ppl
can access to the repository by SSH. Now that I can generate
SSH-authentication keys by ssh-keygen of Linux, or by some Windows
clients, like WinSSHClient(www.ssh.com). My question is if or not I
can keep more than one key on
I have another question.
Let's stick to the scenario Christopher made up. Say person1 thinks it'd
be a good idea to remove some helper-function foo(), and replace it with
another function bar(). Then he commits the sources.
Person2 still works on the outdated source, where foo() exists, and he
14 matches
Mail list logo
