[Top][All Lists]

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


From: Glasgow, Steven R CIV USARMY TRAC (US)
Subject: Conflicts
Date: Wed, 19 Aug 2015 15:24:58 +0000

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:


You will see a line that says the following:

protected static final String TIMESTAMP_DELETED_AND_RESTORED = "restored+";

Clicking on TIMESTAMP_DELETED_AND_RESTORED shows where this variable is

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

Thank you in advance,

reply via email to

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