Conflicts

[Glasgow, Steven R CIV USARMY TRAC (US)]

Something strange happens from time to time. I haven't found a reproducible
pattern to it.

Sometimes CVS indicates conflicts in files when 1) none of those files have
changed locally, 2) some of those files may have been changed in the
repository, and 3) there are no <<<<< >>>>> markers in the files after the
cvs update command.

Solution, so far, is to delete those files locally and do another cvs
update. This pulls down the latest copy from the repository again.

Does anyone know of why this situation might be occurring?

Thank you,
Steve

[Arthur Barrett]

Steve,

It's been ages since I looked at that code - but from memory, if you
have done a merge previously and got a conflict and not committed since,
then you get C.

Please always include your OS and version of CVS server and client in
all bug reports. A trace of the problem occurring is even better...

Regards,


Arthur

-----Original Message-----
org] On Behalf Of Glasgow, Steven R CIV USARMY TRAC (US)
Sent: 20 August 2015 00:03
Subject: Conflicts
Something strange happens from time to time. I haven't found
a reproducible
pattern to it.
Sometimes CVS indicates conflicts in files when 1) none of
those files have
changed locally, 2) some of those files may have been changed in the
repository, and 3) there are no <<<<< >>>>> markers in the
files after the
cvs update command.
Solution, so far, is to delete those files locally and do another cvs
update. This pulls down the latest copy from the repository again.
Does anyone know of why this situation might be occurring?
Thank you,
Steve

[Glasgow, Steven R CIV USARMY TRAC (US)]

I've found some more information related to my last post...

Looking into the Entries file WRT the files that have conflicts, I see lines
like the following:

.
.
.
/<filename1.java>/1.8/Thu Apr 9 19:04:33 2015//
/<filename2.java>/1.2/restored+Tue Aug 11 15:41:44 2015//
/<filename3.java>/1.2/Thu May 15 16:55:18 2014//
.
.
.

The abmormaly is <filename2.java>, which is one of the files showing a
conflict (that isn't actually a conflict). That file has NOT been modified
in the sandbox, and is new to the repository.

This happens only to .java files. We are using Eclipse for development. We
have NOT set up eclipse to access CVS in any way. A google search for "cvs"
and restore+ turns up several links about this. One of which is:

http://code.openhub.net/file?fid=_IBCr2Z1aMkZnSdH-DyInojKUJ4&cid=g0mpTskWtaI
&s=&fp=5905&mp&projSelected=true#L0

You will see a line that says the following:

protected static final String TIMESTAMP_DELETED_AND_RESTORED = "restored+";
//$NON-NLS-1$

Clicking on TIMESTAMP_DELETED_AND_RESTORED shows where this variable is
used.

Does anybody know how I can stop this from happening? Why is eclipse doing
this?

Thank you in advance,
Steve