Community
Participate
Working Groups
Team perspective, pull-down menu, "Compare with...", always displays second compare window empty regardles of what items were selected for comparision.
This is RC1
Team perspective is VCM
There is no Team perspective. Are you refering to the CVS Repository Exploring perspective. Which Compare with operation did you perform (latest from Repository, Branch or Version, Revision)? What do you mean by "second window"? I suspect you mean the one on the right in the lower pane which means that the remote contents were not fetched. Is there anything in your log file?
Yes, you are right, this is CVS Repository Exploring perspective (I just used an old name, I suppose). I select any file in CVS repository view. I can open it and see it in editor. It can be head branch file for example. Then I right click mouse on this file, select "Compare with..." from pull down menu and select anything, also HEAD branch for example . I see the right part of the lower pane is blank. This behavior does not depend on the versions or branches I select to compare. There is nothing in log file.
What CVS server version are you using? I also noticed the platform on the bug is Windows 2000. Is theis the platform the bug is occuring on or is it happening on Photon?
We are using 1.11 Patch 1. Yes, this is Win2000 environment.
I've never heard of 1.11 patch 1. Eclipse supports 1.11.1p1 or later. Please perform a "cvs version" command using the command line to obtain the version. This will give us know version in a format we are familiar with.
This is 1.11.1p1
Is this still happening for you. If so, please follow the steps in the Eclipse CVS FAQ for obtaining the CVS protocol messages (included below). Please include the trace that occurs when you perform the failing operation. http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/platform-vcm- home/docs/online/cvs_features2.0/cvs-faq.html#misc_0 Is there any equivalent to CVS_CLIENT_LOG is Eclipse? Yes, there are tracing facilities in Eclipse that will allow you to see what messages are being communicated between the CVS client and server. Here's how: 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 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 Inside Eclipse, create your repo location and expand it in the repositories view (for example). The CVS command traffic in the debug console should contains an invocation of the update command that looks something like (this is output from dev.eclipse.org): CMD> cvs -n update -d "." ... update E cvs server: Updating . E cvs server: New directory `CVSROOT' -- ignored E cvs server: New directory `jdt-core-home' -- ignored E cvs server: New directory `jdt-debug-home' -- ignored ...
This is a trace log for this operation for file main.c. I tried to compare head branch version with branch release_6.2.0. Additional information: title of the empty panel is "main.c 0". Disclaimer. "I LOVE YOU" is a part of a trace log. Below is a trace log. =============================================================== I LOVE YOU Valid-responses ok error M E Checked-in Valid-requests Template Set-sticky Clear-static-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- dotdot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Questionable Case Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set expand- modules ci co update diff log rlog add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors init annotate rannotate noop version ok Root /product CMD> cvs update -r "1.5" -C -d -P "hardware/devi/hirun/main.c" Argument -r Argument 1.5 Argument -C Argument -d Argument -P Directory hardware/devi/hirun /product/hardware/devi/hirun Entry /main.c/1.5/dummy timestamp// Modified main.c u=rw,g=rw,o=r 0 Argument hardware/devi/hirun/main.c Directory . /product/ update New-entry hardware/devi/hirun/ /product/hardware/devi/hirun/main.c /main.c/1.5///T1.5 M U hardware/devi/hirun/main.c Update-existing hardware/devi/hirun/ /product/hardware/devi/hirun/main.c /main.c/1.5///T1.5 u=rw,g=rw,o=rw 1289 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 Template Set-sticky Clear-static-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- dotdot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Questionable Case Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set expand- modules ci co update diff log rlog add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors init annotate rannotate noop version ok Root /product CMD> cvs update -r "0" -C -d -P "main.c" Argument -r Argument 0 Argument -C Argument -d Argument -P Directory . /product/hardware/devi/hirun Sticky Trelease_620 Entry /main.c/0/dummy timestamp//Trelease_620 Modified main.c u=rw,g=rw,o=r 0 Argument main.c Directory . /product/hardware/devi/hirun update M A main.c ok RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null
It is strange that the main.c is treated as an added resource on the branch. Could you include the trace from the Compare With operation itself (this operation should have provided the proper revision number).
I would appreciate if you tell me which trace flags and in which plugin I should switch on for that.
What I see from the debugger is that revision for the second file is always 0. That's why it uses label "main.c 0" and cannot find second file. First time I see it after processing of the following line (in CompareRemoteWithTagAction.execute()): ResourceEditionNode right = new ResourceEditionNode(editions[0].forTag(tag)); In my case tag.name is "release_621", tag.type = 1; file is "main.c", parent folder is "hirun". syncBytes for the RemoteFile are: [47, 109, 97, 105, 110, 46, 99, 47, 48, 47, 100, 117, 109, 109, 121, 32, 116, 105, 109, 101, 115, 116, 97, 109, 112, 47, 47, 84, 114, 101, 108, 101, 97, 115, 101, 95, 54, 50, 48] I'm sorry if this information is unuseful for you.
Let me clearify my request. The previous trace you included was the one generated when you opened the resource in the compare editor. What I would like to see is the trace (from the same source) that results when you actually perform the Compare With menu operation which resulted in the opening of the Compare Editor. It is the Compare With operation that determines the remote revision(s) we are interested in and may indicate where the revision of 0 came from.
OK. I must use another file because previous one ("main.c") has only one version and "Compare with..." does not show anything. The file I used for comparision is ps2.c. I compared different branches: version 1.5 (branch release_candidate_6_1_0_062001) and version 1.6 (HEAD branch). The first part of the trace is for compare from CVS, the second one (separated with two lines of stars) is for comparing from the Navigator pull down menu. In last case everything is OK: label is "ps2.c 1.5" and I see this version code in the right pannel. ===================================================================== Valid-responses ok error M E Checked-in Valid-requests Template Set-sticky Clear-static-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- dotdot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Questionable Case Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set expand- modules ci co update diff log rlog add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors init annotate rannotate noop version ok Root /product CMD> cvs update -r "0" -C -d -P "ps2.c" Argument -r Argument 0 Argument -C Argument -d Argument -P Directory . /product/hardware/devi/hirun Sticky Trelease_candidate_6_1_0_062001 Entry /ps2.c/0/dummy timestamp//Trelease_candidate_6_1_0_062001 Modified ps2.c u=rw,g=rw,o=r 0 Argument ps2.c Directory . /product/hardware/devi/hirun update M A ps2.c ok RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null ****************************************************************************** ****************************************************************************** Valid-responses ok error M E Checked-in Valid-requests Template Set-sticky Clear-static-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- dotdot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Questionable Case Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set expand- modules ci co update diff log rlog add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors init annotate rannotate noop version ok Root /product CMD> cvs -n update -r "release_candidate_6_1_0_062001" -d "/hirun/ps2.c" Global_option -n Argument -r Argument release_candidate_6_1_0_062001 Argument -d Directory . /product/hardware/devi/hirun Entry /ps2.c/1.6/Tue Jul 24 20:00:17 2001// Unchanged ps2.c Argument ps2.c Directory . /product/hardware/devi/hirun update M U ps2.c 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 Template Set-sticky Clear-static-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- dotdot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Questionable Case Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set expand- modules ci co update diff log rlog add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors init annotate rannotate noop version ok Root /product CMD> cvs status "ps2.c" Directory . /product/hardware/devi/hirun Sticky Trelease_candidate_6_1_0_062001 Entry /ps2.c/0/dummy timestamp//Trelease_candidate_6_1_0_062001 Is-modified ps2.c Argument ps2.c Directory . /product/hardware/devi/hirun status E cvs server: warning: new-born ps2.c has disappeared M =================================================================== M File: no file ps2.c Status: Entry Invalid M M Working revision: New file! M Repository revision: 1.5 /product/hardware/devi/hirun/ps2.c,v M Sticky Tag: release_candidate_6_1_0_062001 (branch: 1.5.2) M Sticky Date: (none) M Sticky Options: (none) M ok RESULT> Status ERRORorg.eclipse.team.cvs.core code=1 The following warnings were reported while performing the "cvs status" command. null children=[Status ERRORorg.eclipse.team.cvs.core code=-14 cvs server: warning: new-born ps2.c has disappeared null] I LOVE YOU Valid-responses ok error M E Checked-in Valid-requests Template Set-sticky Clear-static-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- dotdot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Questionable Case Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set expand- modules ci co update diff log rlog add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors init annotate rannotate noop version ok Root /product CMD> cvs log -r1.5 "ps2.c" Argument -r1.5 Directory . /product/hardware/devi/hirun Sticky Trelease_candidate_6_1_0_062001 Entry /ps2.c/1.5/dummy timestamp//Trelease_candidate_6_1_0_062001 Is-modified ps2.c Argument ps2.c Directory . /product/hardware/devi/hirun log M M RCS file: /product/hardware/devi/hirun/ps2.c,v M Working file: ps2.c M head: 1.6 M branch: M locks: strict M access list: M symbolic names: M release_621_20030127: 1.6 M release_621_A_bridge: 1.6.0.12 M release_621_Beta1_03-12-2002: 1.6 M cisco_branch_620: 1.6.0.10 M ibm-2002-10-21: 1.6.0.4 M intel-nokia-armbe1-020814: 1.6 M release_620: 1.6.0.6 M release_621: 1.6.0.8 M release_620_020603: 1.6 M release_62_bld515: 1.6 M xscale_beta_bsp_032002: 1.6 M release_62_bld447: 1.6 M release_611: 1.6.0.2 M cisco-011030-head: 1.6 M release_6_1_0A_092001: 1.5 M release_6_1_0_072001: 1.5 M release_candidate_6_1_0_062001: 1.5.0.2 M rtp_6_1_0_Beta: 1.5 M qnx4/Proc: 1.2 M ph_20010117: 1.3 M ph_2_0_2: 1.2 M ph_2_0_20000914: 1.1.1.1 M ph_2_0_1: 1.1.1.1 M ph_2_0_20000815: 1.1.1.1 M photon_2_0_porting: 1.1.1.1.0.2 M initial: 1.1.1.1 M qssl: 1.1.1 M keyword substitution: kv M total revisions: 7; selected revisions: 1 M description: M ---------------------------- M revision 1.5 M date: 2001/05/23 13:45:28; author: achapiro; state: Exp; lines: +21 -20 M M This is a code cleaning update. Screen messages are redirected to the system log. M ============================================================================= ok RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null
OK, now I can reproduce this. Sorry about all the churn. I missed the reference to the CVS Repositories View in comment 4. Unfortunately, it's too late for 2.1 but we'll put it in the readme.
That's OK. Thanks.
*** Bug 36273 has been marked as a duplicate of this bug. ***
Fix has been released to R2_1_maintenance branch but requires inspection and approval.
Should also add that the change is in org.eclipe.team.cvs.ui in the CompareRemoteWithTagAction class.
Ready for 2.1.1
Verified.
