On Wed, Aug 19, 2015 at 03:24:58PM +0000, Glasgow, Steven R CIV USARMY TRAC (US) wrote: > 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$ > CVS can rewrite text between $ signs. See 'Keyword substitution' in the CVS info page. Maybe the cvs client misrecognizes the NON-NLS-1 string. I think the substition can be disabled.
-- Petr
pgph4uaBM7s1V.pgp
Description: PGP signature
_______________________________________________ Bug-cvs mailing list Bug-cvs@nongnu.org https://lists.nongnu.org/mailman/listinfo/bug-cvs
