Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 29026

Summary: Tagging warns about uncomitted changes that are not visible otherwise
Product: [Eclipse Project] Platform Reporter: Oyvind Harboe <oyvind.harboe>
Component: TeamAssignee: Michael Valenta <Michael.Valenta>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: flyguy, pascal
Version: 2.1   
Target Milestone: 2.1 M5   
Hardware: PC   
OS: Windows 2000   
Whiteboard:
Attachments:
Description Flags
Shows label decorations for project none

Description Oyvind Harboe CLA 2003-01-06 06:49:12 EST 
Here is what I did:

- Nobody else is using the repository

- Team->Synchronize. Result:

"Workspace resources are the same as remote".

- Team->Tag as version. Result:

"You are tagging 'foobar' that has uncomitted changes..."
Comment 1 Michael Valenta CLA 2003-01-06 10:32:10 EST 
Did you have CVS label decorators on? If so, were there any resources marked as 
dirty?
Comment 2 Oyvind Harboe CLA 2003-01-06 12:12:38 EST 
>Did you have CVS label decorators on? If so, were 
>there any resources marked as dirty?

I don't actually know what they are. Are you talking about things similar to 
$Id$ in RCS? If so, I'm not using them(perhaps they are turned on by default in 
Eclipse).

Other: could ignore whitespace and "consider file contents" be part of the 
explanation? I always turn on ignore whitespace + "consider file contents" on 
compares.
Comment 3 Michael Valenta CLA 2003-01-06 13:06:08 EST 
You can turn on the CVS label decorations by selecting Window>Preferences from 
the Eclipse main menu and checking off the CVS entry on the Worbench/Label 
Decorations page.

Did this problem occur at around the same time as bug 29013?
Comment 4 Oyvind Harboe CLA 2003-01-06 13:32:34 EST 
>Did this problem occur at around the same time as bug 29013?

No. 

Will check more on the decorations tomorrow.

Øyvind
Comment 5 Oyvind Harboe CLA 2003-01-07 02:46:35 EST 
I've done some more checking: I'm not using label decorations.

Is there anything else I should check?

Øyvind
Comment 6 Michael Valenta CLA 2003-01-07 08:55:34 EST 
The only reason I asked about decorators is that they often show what is wrong 
(i.e. a file or folder is marked as dirty when it really isn't). However, I've 
also seen this occur but do not have a reproducable test case yet so I have 
been unable to isolate the problem. If you see it again, please provide as many 
details as possible (and if you can come up with a reproducable case, you're a 
hero).
Comment 7 Oyvind Harboe CLA 2003-01-07 09:09:09 EST 
Created attachment 2908 [details]
Shows label decorations for project

The problem appears to be reproducable on my machine. 

I'm not too familar with label decorations, but it appears that
LinearInterpolate.java is marked as different than the repository although it
isn't(ditto for runit.cmd).
Comment 8 Michael Valenta CLA 2003-01-07 09:48:05 EST 
Could you perform the following steps and attach the console output to this 
report.

1. Create a file named ".options" in you eclipse directory (the directory that 
contains the executable) that contains the following 2 lines that enable CVS 
debugging. 
		org.eclipse.team.cvs.core/debug=true
		org.eclipse.team.cvs.core/cvsprotocol=true
		
2. Start Eclipse with the following parameters tailored to you local setup (The 
below example is for windows). The important aspects are the use of java.exe 
instead of javaw.exe and the inclusion of the -debug and -consolelog options. 
These will cause the debug console to be visible and for debugging output to 
appear in the console. 
		C:\eclipse\eclipse.exe
		   -vm C:\jre\bin\java.exe
		   -data C:\eclipse\workspace
		   -debug
		   -consolelog
		
3. Inside Eclipse, perform a Team>Synchronize with Repository. The CVS command 
traffic in the debug console should contains an invocation of several update 
commands that looks something like (this is output from dev.eclipse.org): 
		CMD> cvs -n update -d "."
		...
		update
		E cvs server: Updating .
		...
Comment 9 Oyvind Harboe CLA 2003-01-07 09:57:37 EST 
Output from a Team->Synchronize

-------------

Startup: using configuration file:C:\m4\workspace\.metadata\.config\platform.cfg

Boot URL: file:C:/m4/plugins/org.eclipse.core.boot_2.1.0/boot.jar
Startup: splash path = C:\m4\plugins\org.eclipse.platform_2.1.0\splash.bmp
Workspace location:
   C:\m4\workspace
Debug-Options:
    file:C:/m4/.options
Install URL:
    file:C:/m4/
I LOVE YOU
Valid-responses ok error M E Checked-in Valid-requests Set-sticky MT Clear-stati
c-directory Module-expansion Set-static-directory Clear-sticky New-entry Removed
 Merged Remove-entry Updated Update-existing Copy-file Notified Created Mod-time

valid-requests
Valid-requests Root Valid-responses valid-requests Repository Directory Max-dotd
ot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modi
fied Is-modified UseUnchanged Unchanged Notify Questionable Case Utf8 Argument A
rgumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set expand-modules
ci co chown setowner setperm chacl setacl listperm lsacl setpass passwd update d
iff log rlog add remove update-patches gzip-file-contents status ls rdiff tag rt
ag import admin export history release watch-on watch-off watch-add watch-remove
 watchers editors init annotate rannotate noop version Rootless-stream-modificat
ion Kerberos-encrypt Gssapi-encrypt Protocol-encrypt Gssapi-authenticate Protoco
l-authenticate
ok
Root d:/dev/cvsrepo/cyviz
CMD> cvs version
version
M Concurrent Versions System (CVSNT) 1.11.1.3  (Build 57i) (client/server)
ok
RESULT> Status WARNINGorg.eclipse.team.cvs.core code=1 The following warnings we
re reported while performing the "cvs version" command. null children=[Status WA
RNINGorg.eclipse.team.cvs.core code=-21 Host 'cyviz-hpserver' is running CVS NT
(version 1.11.1.3) which is not fully supported. However, most functionality is
available. null]
CMD> cvs -n update -d "/edgemaster"
Global_option -n
Argument -d
Directory .
d:/dev/cvsrepo/cyviz/xpo/edgemaster
Entry /.project/1.1//-ko/
Unchanged .project
Entry /build.xml/1.3//-ko/
Unchanged build.xml
Entry /build.properties/1.27//-ko/
Unchanged build.properties
Entry /.classpath/1.9//-ko/
Modified .classpath
u=rw,g=rw,o=r
768
Entry /runit.cmd/1.1//-kb/
Modified runit.cmd
u=rw,g=rw,o=r
271
Directory Serialio
d:/dev/cvsrepo/cyviz/xpo/edgemaster/Serialio
Directory Serialio/zmodem
d:/dev/cvsrepo/cyviz/xpo/edgemaster/Serialio/zmodem
Directory com
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com
Directory com/cyviz
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz
Directory com/cyviz/gui
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/gui
Entry /Version.java/1.2//-ko/
Unchanged Version.java
Entry /Progress.java/1.2//-ko/
Unchanged Progress.java
Entry /EdgeBlendSimulation.java/1.6//-ko/
Unchanged EdgeBlendSimulation.java
Entry /EdgeMaster.java/1.2//-ko/
Unchanged EdgeMaster.java
Entry /XPOSWT.java/1.26//-ko/
Unchanged XPOSWT.java
Entry /CyvizLab.java/1.5//-ko/
Unchanged CyvizLab.java
Entry /RGBFun.java/1.2//-ko/
Unchanged RGBFun.java
Entry /LinkMaster.java/1.2//-ko/
Unchanged LinkMaster.java
Entry /PowerFade.java/1.2//-ko/
Unchanged PowerFade.java
Entry /XYZColor.java/1.1//-ko/
Unchanged XYZColor.java
Entry /ProjectorEmulator.java/1.2//-ko/
Unchanged ProjectorEmulator.java
Directory com/cyviz/xpo
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/xpo
Entry /Generic.java/1.2//-ko/
Unchanged Generic.java
Entry /EnumerationFailed.java/1.2//-ko/
Unchanged EnumerationFailed.java
Entry /SaveException.java/1.2//-ko/
Unchanged SaveException.java
Entry /NoSignal.java/1.2//-ko/
Unchanged NoSignal.java
Entry /COMMException.java/1.2//-ko/
Unchanged COMMException.java
Entry /SourceSignalChanged.java/1.2//-ko/
Unchanged SourceSignalChanged.java
Entry /OldFirmwareException.java/1.2//-ko/
Unchanged OldFirmwareException.java
Entry /BoxVisitor.java/1.1//-ko/
Unchanged BoxVisitor.java
Entry /XPOException.java/1.2//-ko/
Unchanged XPOException.java
Entry /IllegalState.java/1.3//-ko/
Unchanged IllegalState.java
Entry /Connection.java/1.33//-ko/
Unchanged Connection.java
Entry /GainTable.java/1.1//-ko/
Unchanged GainTable.java
Entry /UnknownFirmwareException.java/1.1//-ko/
Unchanged UnknownFirmwareException.java
Entry /NoXPOFound.java/1.2//-ko/
Unchanged NoXPOFound.java
Entry /TimeOut.java/1.4//-ko/
Unchanged TimeOut.java
Entry /IO.java/1.2//-ko/
Unchanged IO.java
Directory com/cyviz/minolta
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/minolta
Entry /F1Photo2.java/1.1///
Unchanged F1Photo2.java
Entry /M3Small.java/1.1///
Unchanged M3Small.java
Entry /ProjectorCharacteristic.java/1.7///
Unchanged ProjectorCharacteristic.java
Entry /DumpXYZ.java/1.11//-ko/
Modified DumpXYZ.java
u=rw,g=rw,o=r
13353
Entry /F1Photo.java/1.2///
Unchanged F1Photo.java
Entry /M3.java/1.4///
Unchanged M3.java
Entry /F1Bright.java/1.1///
Unchanged F1Bright.java
Entry /M3High.java/1.2///
Unchanged M3High.java
Directory com/cyviz/blendmath
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/blendmath
Entry /GainTable.java/1.3//-ko/
Unchanged GainTable.java
Directory com/cyviz/logging
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/logging
Entry /Listener.java/1.2//-ko/
Unchanged Listener.java
Entry /Log.java/1.2//-ko/
Unchanged Log.java
Directory com/cyviz/swt
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/swt
Entry /SliderValueModel.java/1.2//-ko/
Unchanged SliderValueModel.java
Directory com/cyviz/math
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/math
Entry /LinearInterpolate.java/1.2///
Modified LinearInterpolate.java
u=rw,g=rw,o=r
1192
Directory com/cyviz/blender
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/blender
Entry /GammaValue.java/1.2//-ko/
Unchanged GammaValue.java
Entry /BlenderException.java/1.1//-ko/
Unchanged BlenderException.java
Entry /BlackValue.java/1.1//-ko/
Unchanged BlackValue.java
Entry /ColorValue.java/1.2//-ko/
Unchanged ColorValue.java
Entry /Blender.java/1.27//-ko/
Unchanged Blender.java
Entry /BlenderUI.java/1.7//-ko/
Unchanged BlenderUI.java
Entry /SampleBlendValue.java/1.2//-ko/
Unchanged SampleBlendValue.java
Entry /EdgeGain.java/1.6//-ko/
Unchanged EdgeGain.java
Entry /ChangeListenerList.java/1.1//-ko/
Unchanged ChangeListenerList.java
Entry /ChangeListener.java/1.1//-ko/
Unchanged ChangeListener.java
Entry /ComboModel.java/1.4//-ko/
Unchanged ComboModel.java
Entry /ValueModel.java/1.5//-ko/
Unchanged ValueModel.java
Entry /BlenderXPOException.java/1.2//-ko/
Unchanged BlenderXPOException.java
Directory graphics
d:/dev/cvsrepo/cyviz/xpo/edgemaster/graphics
Entry /buttons_small_toggle.gif/1.1//-kb/
Unchanged buttons_small_toggle.gif
Entry /25x25_osd_left_button.gif/1.1//-kb/
Unchanged 25x25_osd_left_button.gif
Entry /25x25_osd_down_button.gif/1.1//-kb/
Unchanged 25x25_osd_down_button.gif
Entry /cyviz_icon_32x32.gif/1.1//-kb/
Unchanged cyviz_icon_32x32.gif
Entry /buttons_small_menu.gif/1.1//-kb/
Unchanged buttons_small_menu.gif
Entry /test.jpg/1.1//-kb/
Unchanged test.jpg
Entry /cyviz_icon_16x16.gif/1.1//-kb/
Unchanged cyviz_icon_16x16.gif
Entry /buttons_small_rightblack.gif/1.1//-kb/
Unchanged buttons_small_rightblack.gif
Entry /cyviz_icon_72x72.gif/1.1//-kb/
Unchanged cyviz_icon_72x72.gif
Entry /25x25_osd_up_button.gif/1.1//-kb/
Unchanged 25x25_osd_up_button.gif
Entry /25x25_cyviz_logo.gif/1.1//-kb/
Unchanged 25x25_cyviz_logo.gif
Entry /cyviz.gif/1.1//-kb/
Unchanged cyviz.gif
Entry /buttons_small_user.gif/1.1//-kb/
Unchanged buttons_small_user.gif
Entry /buttons_small.gif/1.1//-kb/
Unchanged buttons_small.gif
Entry /25x25_osd_right_button.gif/1.2//-kb/
Unchanged 25x25_osd_right_button.gif
Directory testing
d:/dev/cvsrepo/cyviz/xpo/edgemaster/testing
Argument .
Directory .
d:/dev/cvsrepo/cyviz/xpo/edgemaster
update
E cvs server: Updating .
E cvs server: Updating Serialio
E cvs server: Updating Serialio/zmodem
E cvs server: Updating com
E cvs server: Updating com/cyviz
E cvs server: Updating com/cyviz/blender
E cvs server: Updating com/cyviz/blendmath
E cvs server: Updating com/cyviz/gui
E cvs server: Updating com/cyviz/logging
E cvs server: Updating com/cyviz/math
E cvs server: Updating com/cyviz/minolta
E cvs server: Updating com/cyviz/swt
E cvs server: Updating com/cyviz/xpo
E cvs server: Updating graphics
E cvs server: Updating testing
ok
RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null
I LOVE YOU
Valid-responses ok error M E Checked-in Valid-requests Set-sticky MT Clear-stati
c-directory Module-expansion Set-static-directory Clear-sticky New-entry Removed
 Merged Remove-entry Updated Update-existing Copy-file Notified Created Mod-time

valid-requests
Valid-requests Root Valid-responses valid-requests Repository Directory Max-dotd
ot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modi
fied Is-modified UseUnchanged Unchanged Notify Questionable Case Utf8 Argument A
rgumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set expand-modules
ci co chown setowner setperm chacl setacl listperm lsacl setpass passwd update d
iff log rlog add remove update-patches gzip-file-contents status ls rdiff tag rt
ag import admin export history release watch-on watch-off watch-add watch-remove
 watchers editors init annotate rannotate noop version Rootless-stream-modificat
ion Kerberos-encrypt Gssapi-encrypt Protocol-encrypt Gssapi-authenticate Protoco
l-authenticate
ok
Root d:/dev/cvsrepo/cyviz
I LOVE YOU
Valid-responses ok error M E Checked-in Valid-requests Set-sticky MT Clear-stati
c-directory Module-expansion Set-static-directory Clear-sticky New-entry Removed
 Merged Remove-entry Updated Update-existing Copy-file Notified Created Mod-time

valid-requests
Valid-requests Root Valid-responses valid-requests Repository Directory Max-dotd
ot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modi
fied Is-modified UseUnchanged Unchanged Notify Questionable Case Utf8 Argument A
rgumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set expand-modules
ci co chown setowner setperm chacl setacl listperm lsacl setpass passwd update d
iff log rlog add remove update-patches gzip-file-contents status ls rdiff tag rt
ag import admin export history release watch-on watch-off watch-add watch-remove
 watchers editors init annotate rannotate noop version Rootless-stream-modificat
ion Kerberos-encrypt Gssapi-encrypt Protocol-encrypt Gssapi-authenticate Protoco
l-authenticate
ok
Root d:/dev/cvsrepo/cyviz
CMD> cvs update -r "1.2" -C -d -P "com/cyviz/math/LinearInterpolate.java"
Argument -r
Argument 1.2
Argument -C
Argument -d
Argument -P
Directory com/cyviz/math
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/math
Entry /LinearInterpolate.java/1.2///
Modified LinearInterpolate.java
u=rw,g=rw,o=r
0
Argument com/cyviz/math/LinearInterpolate.java
Directory .
d:/dev/cvsrepo/cyviz/xpo/edgemaster
update
New-entry com/cyviz/math/
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/math/LinearInterpolate.java
/LinearInterpolate.java/1.2///T1.2
MT +updated
MT text U
MT fname com/cyviz/math/LinearInterpolate.java
MT newline
MT -updated
Update-existing com/cyviz/math/
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/math/LinearInterpolate.java
/LinearInterpolate.java/1.2///T1.2
u=rw,g=rw,o=rw
1192
ok
RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null
CMD> cvs update -r "1.11" -C -d -P "com/cyviz/minolta/DumpXYZ.java"
Argument -r
Argument 1.11
Argument -C
Argument -d
Argument -P
Directory com/cyviz/minolta
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/minolta
Entry /DumpXYZ.java/1.11//-ko/
Modified DumpXYZ.java
u=rw,g=rw,o=r
0
Argument com/cyviz/minolta/DumpXYZ.java
Directory .
d:/dev/cvsrepo/cyviz/xpo/edgemaster
update
New-entry com/cyviz/minolta/
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/minolta/DumpXYZ.java
/DumpXYZ.java/1.11//-ko/T1.11
MT +updated
MT text U
MT fname com/cyviz/minolta/DumpXYZ.java
MT newline
MT -updated
Update-existing com/cyviz/minolta/
d:/dev/cvsrepo/cyviz/xpo/edgemaster/com/cyviz/minolta/DumpXYZ.java
/DumpXYZ.java/1.11//-ko/T1.11
u=rw,g=rw,o=rw
13353
ok
RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null
CMD> cvs update -r "1.1" -C -d -P "runit.cmd"
Argument -r
Argument 1.1
Argument -C
Argument -d
Argument -P
Directory .
d:/dev/cvsrepo/cyviz/xpo/edgemaster
Entry /runit.cmd/1.1//-kb/
Modified runit.cmd
u=rw,g=rw,o=r
0
Argument runit.cmd
Directory .
d:/dev/cvsrepo/cyviz/xpo/edgemaster
update
New-entry ./
d:/dev/cvsrepo/cyviz/xpo/edgemaster/runit.cmd
/runit.cmd/1.1//-kb/T1.1
MT +updated
MT text U
MT fname runit.cmd
MT newline
MT -updated
Update-existing ./
d:/dev/cvsrepo/cyviz/xpo/edgemaster/runit.cmd
/runit.cmd/1.1//-kb/T1.1
u=rw,g=rw,o=rw
271
ok
RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null
CMD> cvs update -r "1.9" -C -d -P ".classpath"
Argument -r
Argument 1.9
Argument -C
Argument -d
Argument -P
Directory .
d:/dev/cvsrepo/cyviz/xpo/edgemaster
Entry /.classpath/1.9//-ko/
Modified .classpath
u=rw,g=rw,o=r
0
Argument .classpath
Directory .
d:/dev/cvsrepo/cyviz/xpo/edgemaster
update
New-entry ./
d:/dev/cvsrepo/cyviz/xpo/edgemaster/.classpath
/.classpath/1.9//-ko/T1.9
MT +updated
MT text U
MT fname .classpath
MT newline
MT -updated
Update-existing ./
d:/dev/cvsrepo/cyviz/xpo/edgemaster/.classpath
/.classpath/1.9//-ko/T1.9
u=rw,g=rw,o=rw
768
ok
RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null
Comment 10 Michael Valenta CLA 2003-01-07 10:33:00 EST 
Thanks. Do you have the "Consider File COntents in Comparisons" preference 
enabled on the Team>CVS preference page?
Comment 11 Michael Valenta CLA 2003-01-07 10:51:09 EST 
*** Bug 28759 has been marked as a duplicate of this bug. ***
Comment 12 Oyvind Harboe CLA 2003-01-07 11:22:39 EST 
>Thanks. Do you have the "Consider File COntents in Comparisons" 
>preference enabled on the Team>CVS preference page?

I believe so(I'm at home), though sometimes I turn it on manually in the 
comparison view. I recently switched from 2.0.2 to M4 and I may have forgotten 
to reenable this preference option.

BTW, the comparsion view is not shown when there are no differences. No big 
deal, but you can't see whether or not this option is turned on in the view. 

The default in the preferences page I can still check though.

Øyvind
Comment 13 Oyvind Harboe CLA 2003-01-08 01:57:32 EST 
I don't know if this is relevant, but my machine had its clock set incorrectly. 
It was set to 2002 instead of 2003.

I didn't change the clock on my machine that I know of.

Wildly speculating on how it might have happened:

- I changed the clock, but wasn't aware of it
- Some program I'm using changed the clock
- Windows 2000 didn't handle 2002->2003(somehow related to hibernate and 
Windows 2000).
Comment 14 Michael Valenta CLA 2003-01-08 10:40:52 EST 
Your time problem may be related but I did find a subtle bug that may have 
caused this as well. The fix has been released to HEAD. Thanks for you effort 
on this. You should be able to reset the dirty indicators on the false dirty 
resources by performing a Team>Update
Comment 15 Michael Valenta CLA 2003-01-14 08:46:34 EST 
*** Bug 29413 has been marked as a duplicate of this bug. ***
Comment 16 IH CLA 2003-01-14 12:38:41 EST 
****You should be able to reset the dirty indicators on the false dirty 
resources by performing a Team>Update


This doesn't work for me.  Are you sure Bug 29413 is a dup of this.  The only
way it seems to work is if I turn the prune empty directories off and do an update.
Comment 17 IH CLA 2003-01-14 12:46:46 EST 
I guess I'll just leave prune empty directories off until M5.
Comment 18 Michael Valenta CLA 2003-01-14 13:52:39 EST 
Although not technically a duplicate, I discovered your problem (and fixed it) 
when looking into this one.