[Cvsnt] 'cvs server: conflict: <file> is modified but no longer in the re pository' error on branch

[Rob Dyck]

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.
--
[ Picked text/plain from multipart/alternative ]
On some of my branches, but not others, I am experiencing strange behavior.

If I get a hierarchy an a branch using cvs get -r <branchname> module,
then modify a file in that hierarchy and do a cvs upd,
I get the following error message:
	cvs server: conflict: <filename> is modified but no longer in the
repository

The file is in the repository, and it is in that branch.

The branches that it happens on are older than the ones it doesn't, but that
might be irrelevant.

Another bit of related strange behavior is that when I converted a working
hierarchy that was previously on the trunk to being on the branch by using
cvs upd -r <branchname>, a number of files were removed from my working
hierarchy because they were 'no longer pertinent'.  When I ran the upd
again, they came back.

I think that it is the set of files that go away and come back that I have
the first problem with.

Does anyone know what is going on here?

_______________________________________________
Cvsnt mailing list
Cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt