RE: Entries file (was: Conflicts)

------=_NextPart_000_001E_01D0DB23.82D80D80
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: 7bit

Arthur,

Thank you for reading my post...I found the problem and it is Eclipse.  CVS
knows nothing about the "restored+" string.

After a new .java file is added to the repository, and someone else does a
cvs update, pulling in that file to their sandbox, the Entries file is
normal.

Then if that person opens up Eclipse and refreshes their project to bring
the new files into the project, Eclipse rewrites the Entries file, placing
"restored+" in front of the time stamp for those new files.

Any subsequent cvs updates will show conflicts in those files.  If you
remove the "restored+" from the time stamp, CVS will no longer complain
about conflicts and Eclipse no longer changes the Entries files.

Not sure why they are doing this, but I expect that if I was accessing the
repository from within Eclipse, it would know how to deal with the
"restored+" information.  But, we use CVS on the command line which seems to
have conflicts what Eclipse is doing.

Thank you for your time, I'm taking this problem to the Eclipse forums.


V/R
Steve



------=_NextPart_000_001E_01D0DB23.82D80D80
Content-Type: application/pkcs7-signature; name="smime.p7s"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="smime.p7s"

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
LmRpc2EubWlsL2NybC9ET0RFTUFJTENBXzMxLmNybDAOBgNVHQ8BAf8EBAMCBSAwIwYDVR0gBBww
GjALBglghkgBZQIBCwkwCwYJYIZIAWUCAQsTMB0GA1UdDgQWBBQ03UeWi1YeQm7m3YP3mxw5P5zb
dzBoBggrBgEFBQcBAQRcMFowNgYIKwYBBQUHMAKGKmh0dHA6Ly9jcmwuZGlzYS5taWwvc2lnbi9E
T0RFTUFJTENBXzMxLmNlcjAgBggrBgEFBQcwAYYUaHR0cDovL29jc3AuZGlzYS5taWwwKAYDVR0R
BCEwH4Edc3RldmVuLnIuZ2xhc2dvdy5jaXZAbWFpbC5taWwwGwYDVR0JBBQwEjAQBggrBgEFBQcJ
BDEEEwJVUzANBgkqhkiG9w0BAQUFAAOCAQEAh95j0u/fuLjbBedHnKs8iffYYzZpD2CG7p8N2KGj
F7s1uPdTl6M9O3ibzn7tlLpyGjXHRgfox2OWgnzYjcxnQvPBUnhaGdAL6oTNI5n9l/EVZ+Cez2vJ
ehQRmoFNAqdvH/AlvLu1WxYr0bjZJNxFX+bpBTnZcSKCmX3OLPdG6YGfieOjRv+HAkIcnggBVtgx
JAPJGzsAtGFOJqUe+KzSJUkFp2l70i+Fg4XZ+12X/VhIcCLskz8gS5dZKHUgJy6EWjIrHUJqIbJi
g/S5dJSadZtsoFVPRhBKRJzvQc+oCe7nR9Gio+ouC2E3jyP3JxUdig1PJaoAERLswyAKh+28HjCC
BUwwggQ0oAMCAQICAgOdMA0GCSqGSIb3DQEBBQUAMFsxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9V
LlMuIEdvdmVybm1lbnQxDDAKBgNVBAsTA0RvRDEMMAoGA1UECxMDUEtJMRYwFAYDVQQDEw1Eb0Qg
Um9vdCBDQSAyMB4XDTEzMDExNjE0NDkzMFoXDTE5MDExNjE0NDkzMFowVzELMAkGA1UEBhMCVVMx
GDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMQwwCgYDVQQLEwNQS0kxEjAQ
BgNVBAMTCURPRCBDQS0zMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMYnEC+QljjZ
3+ZfP7qJ+2aC67al7fBWkBZA52yisHlmWdeYYjHRMyJT4x5cpFZmpk1W+8PiQhKr+cBKS0DvkROG
OTBR1m6OJ7dBiSkB7lhGcwRxRFxpQz4y5mTfs2uZLHCi0D5N2FgSbUXwPZNUvt/i+88R//yKATfv
py66QAxqPhzkCjKAab0iOexLdsmxWpM8IYQ43XMTgvldDIEKqbJTdNkLjsDol7s9XxOMtbk77Pa7
nY4g9mu8nRQy3H654mOwasGAuRb8ke+ssgmfUkdYE15ifpoShlvFIB/hjmYAdlPs5yKJIUxfuem+
oFKTDqbI3sy3gq0ibYvQMFM2VVcCAwEAAaOCAhwwggIYMB0GA1UdDgQWBBRE40ajQe5gsV6nkyX0
oFPut0m+uzAfBgNVHSMEGDAWgBRJdLsMXrp6/gJU73ugxpXGCYBwljASBgNVHRMBAf8ECDAGAQH/
AgEAMAwGA1UdJAQFMAOAAQAwDgYDVR0PAQH/BAQDAgGGMGYGA1UdIARfMF0wCwYJYIZIAWUCAQsF
MAsGCWCGSAFlAgELCTALBglghkgBZQIBCxEwCwYJYIZIAWUCAQsSMAsGCWCGSAFlAgELEzAMBgpg
hkgBZQMCAQMaMAwGCmCGSAFlAwIBAxswNwYDVR0fBDAwLjAsoCqgKIYmaHR0cDovL2NybC5kaXNh
Lm1pbC9jcmwvRE9EUk9PVENBMi5jcmwwggEBBggrBgEFBQcBAQSB9DCB8TA6BggrBgEFBQcwAoYu
aHR0cDovL2NybC5kaXNhLm1pbC9pc3N1ZWR0by9ET0RST09UQ0EyX0lULnA3YzAgBggrBgEFBQcw
AYYUaHR0cDovL29jc3AuZGlzYS5taWwwgZAGCCsGAQUFBzAChoGDbGRhcDovL2NybC5nZHMuZGlz
YS5taWwvY24lM2REb0QlMjBSb290JTIwQ0ElMjAyJTJjb3UlM2RQS0klMmNvdSUzZERvRCUyY28l
M2RVLlMuJTIwR292ZXJubWVudCUyY2MlM2RVUz9jcm9zc0NlcnRpZmljYXRlUGFpcjtiaW5hcnkw
DQYJKoZIhvcNAQEFBQADggEBAEdRUtz0oHOaQucL7CORjSV1tESCNKr5RnVRw/YO+OfjL7Qgw++h
ZTTgnYfB5i5i8Cfo68XPNZXSQICLkgm2phvVEmQx27XUDt8KirZW9bx2kpMZfL9lfXKB2GR7OTSK
dljMHUP3B88cgwNzvjgX23StaQkRfO3Y1gKNZj2ra8oz28d6ZsXepydID2YS7mgkwO+R6gYZKlBY
E+Ai/A6xJPvrjkICD3eIFYvm8vVTt3zgVZsT1rZwynNw41MlwSgee8QsSW6Q26rLWwMbwoeH9au+
UXFzbSZme5sdF+Dt48DeHSex7Q00Rj7dLl70gnDa0ZMbed3WSufO+T9zH86K5hYwggVSMIIEOqAD
AgECAgIDnzANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zl
cm5tZW50MQwwCgYDVQQLEwNEb0QxDDAKBgNVBAsTA1BLSTEWMBQGA1UEAxMNRG9EIFJvb3QgQ0Eg
MjAeFw0xMzAxMTYxNDUyNDNaFw0xOTAxMTYxNDUyNDNaMF0xCzAJBgNVBAYTAlVTMRgwFgYDVQQK
Ew9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsTA0RvRDEMMAoGA1UECxMDUEtJMRgwFgYDVQQDEw9E
T0QgRU1BSUwgQ0EtMzEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDorgIsQEw6UuiL
c5K0d+c4S8DwqkoYXMf3NcNK8PCWd6WXvifvxEQhgOoWNLcw0UQ4fyrOBMaRZaluUHzITv69wLVL
FuQ4UhXbs7f3Uz3ysQfbkWZdwbfyd2bEUZpjlBFLAh0NS3yzAEcHeRj6eLOTH9R2bZkExR42RvwG
NAvjaG8efJ8sz2G4S/+03wafoF+UXus1/wldNUAH8p3tlgnZdur+bjH+y/RF6zB4SGhsoSk+hn2T
QUrq5wxM5ZFQKqVDZrwiwPwbLOTzL2IeBNQhv6wfJnc10B284rtGwvLr5BSu+LNrs/pxOLBxKe3R
ixvXAhveyux+7qHcSKXxPpSpAgMBAAGjggIcMIICGDAdBgNVHQ4EFgQUhvFbaG/dMPOUgmjUTPdE
HbjKaIEwHwYDVR0jBBgwFoAUSXS7DF66ev4CVO97oMaVxgmAcJYwEgYDVR0TAQH/BAgwBgEB/wIB
ADAMBgNVHSQEBTADgAEAMA4GA1UdDwEB/wQEAwIBhjBmBgNVHSAEXzBdMAsGCWCGSAFlAgELBTAL
BglghkgBZQIBCwkwCwYJYIZIAWUCAQsRMAsGCWCGSAFlAgELEjALBglghkgBZQIBCxMwDAYKYIZI
AWUDAgEDGjAMBgpghkgBZQMCAQMbMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly9jcmwuZGlzYS5t
aWwvY3JsL0RPRFJPT1RDQTIuY3JsMIIBAQYIKwYBBQUHAQEEgfQwgfEwOgYIKwYBBQUHMAKGLmh0
dHA6Ly9jcmwuZGlzYS5taWwvaXNzdWVkdG8vRE9EUk9PVENBMl9JVC5wN2MwIAYIKwYBBQUHMAGG
FGh0dHA6Ly9vY3NwLmRpc2EubWlsMIGQBggrBgEFBQcwAoaBg2xkYXA6Ly9jcmwuZ2RzLmRpc2Eu
bWlsL2NuJTNkRG9EJTIwUm9vdCUyMENBJTIwMiUyY291JTNkUEtJJTJjb3UlM2REb0QlMmNvJTNk
VS5TLiUyMEdvdmVybm1lbnQlMmNjJTNkVVM/Y3Jvc3NDZXJ0aWZpY2F0ZVBhaXI7YmluYXJ5MA0G
CSqGSIb3DQEBBQUAA4IBAQBZMq2qw/jfnGSccQk0wb28YwAeLdvtqcgI47kY5K/KrhTB3bv5c4OD
V46UyaCqAwfOZ5y15RdZPyi4Fzbauo3DlhEBalDWBtpopErSC4V8zYjf/1535vWkSJHQTqJnavho
76oXRe/Ylgrdz/A+h7a/iD/TVL4+Es6h+QtvMtFUv4RbNaDbB2S1q+l5HuLyqnRy55ES98e7bu7l
dJAQJIu3582chZBH5OJvfyC9LLuDliNNqEzYfi5eFSm4JX1XNQstFVSMqdzg5TedqE8glYMrxRI2
Pahz4U6ISaW5u/oJSihaM7nkknlbe/ilT/PJNM2ZjLC6YH6fhD7mPPp+WuvmMYIC+DCCAvQCAQEw
XjBXMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0Qx
DDAKBgNVBAsTA1BLSTESMBAGA1UEAxMJRE9EIENBLTMxAgM6K08wCQYFKw4DAhoFAKCCAW8wGAYJ
KoZIhvcNAQkDMQsGCSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMTUwODIwMTMzNzU1WjAjBgkq
hkiG9w0BCQQxFgQU9Uwj7tdF8hpwlNaNZhqBEpmXNdgwJAYJKoZIhvcNAQkPMRcwFTAKBggqhkiG
9w0DBzAHBgUrDgMCGjBzBgkrBgEEAYI3EAQxZjBkMF0xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9V
LlMuIEdvdmVybm1lbnQxDDAKBgNVBAsTA0RvRDEMMAoGA1UECxMDUEtJMRgwFgYDVQQDEw9ET0Qg
RU1BSUwgQ0EtMzECAzrt4TB1BgsqhkiG9w0BCRACCzFmoGQwXTELMAkGA1UEBhMCVVMxGDAWBgNV
BAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMQwwCgYDVQQLEwNQS0kxGDAWBgNVBAMT
D0RPRCBFTUFJTCBDQS0zMQIDOu3hMA0GCSqGSIb3DQEBAQUABIIBAFrYR3E9xTBgBwzF7u6m32o8
gdaBsCgJSXmbhu7J04hw0x9F/RdmR91lQ/CdZMqtJYKlGpVFWfdRM3TgFvYPkENBLAivWsL8vU52
+vgPfeQM7szGjD9e9lYVbuKEL25NIoAfqdjxoAv1WVIF8GUImPd4LsgB24sL95RDeHegWKeM9pSG
1Y1P7cKetcg41D5+1W08YxvLeh1Aly93j6GhwmuG7YhaQZQ30o46kskp3gc+NWjL/ga35yP62NQa
5X6NLgRwMjlFRBAVn4oiWEBxFpaPwDHdVeU+Gm9uvUUpV8nbHLqlXUuBM3AuU1by7AePAjrU1EXM
dmhJjgG2V8ZpOzAAAAAAAAA=

------=_NextPart_000_001E_01D0DB23.82D80D80--