Groups | Search | Server Info | Keyboard shortcuts | Login | Register

Groups > gnu.cvs.bug > #200

Conflicts

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

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

Back to gnu.cvs.bug | Previous | Next — Next in thread | Find similar

Thread

Conflicts "Glasgow, Steven R CIV USARMY TRAC (US)" <steven.r.glasgow.civ@mail.mil> - 2015-08-19 15:24 +0000
  Re: Conflicts Steve Glasgow <sirglasgow@gmail.com> - 2015-08-19 10:14 -0700

csiph-web