Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
| X-Received | by 10.70.36.162 with SMTP id r2mr11158073pdj.4.1440004475712; Wed, 19 Aug 2015 10:14:35 -0700 (PDT) |
|---|---|
| X-Received | by 10.140.104.115 with SMTP id z106mr174718qge.23.1440004475447; Wed, 19 Aug 2015 10:14:35 -0700 (PDT) |
| Path | csiph.com!xmission!news.glorb.com!se8no6505583igc.0!news-out.google.com!78ni16750qge.1!nntp.google.com!69no2122621qgi.0!postnews.google.com!glegroupsg2000goo.googlegroups.com!not-for-mail |
| Newsgroups | gnu.cvs.bug |
| Date | Wed, 19 Aug 2015 10:14:35 -0700 (PDT) |
| In-Reply-To | <mailman.8640.1440000347.904.bug-cvs@nongnu.org> |
| Complaints-To | groups-abuse@google.com |
| Injection-Info | glegroupsg2000goo.googlegroups.com; posting-host=141.107.159.53; posting-account=ZdiZrgoAAAAK5xeMwds1IcU6bUQu5yYX |
| NNTP-Posting-Host | 141.107.159.53 |
| References | <mailman.8640.1440000347.904.bug-cvs@nongnu.org> |
| User-Agent | G2/1.0 |
| MIME-Version | 1.0 |
| Message-ID | <3e39a3ab-2e67-479b-a82f-0c25cbde2c4e@googlegroups.com> (permalink) |
| Subject | Re: Conflicts |
| From | Steve Glasgow <sirglasgow@gmail.com> |
| Injection-Date | Wed, 19 Aug 2015 17:14:35 +0000 |
| Content-Type | text/plain; charset=ISO-8859-1 |
| Xref | csiph.com gnu.cvs.bug:201 |
Show key headers only | View raw
In summary: 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/added 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. 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 abnormality 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, and has "restored+" attached to the time stamp. This seems to happen 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 "restored+" 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. I think eclipse is just checking for the restored+ string and adjusting their internal variables appropriately. I think that CVS is putting the restored+ in the Entries file. How and why? Does anybody know how I can stop this from happening? It's possible eclipse is doing it, but I don't see that in their code. Does anyone know of why this situation might be occurring? What is the restored+ used for? Thank you in advance, Steve
Back to gnu.cvs.bug | Previous | Next — Previous in thread | Find similar
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