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

Bug 323493

Summary: CVS Compare of remote version shows only CHANGED resources, not NEW and DELETED resource
Product: [Eclipse Project] Platform Reporter: Arno Unkrig <arno>
Component: CVSAssignee: Tomasz Zarna <tomasz.zarna>
Status: VERIFIED FIXED QA Contact:
Severity: major    
Priority: P3    
Version: 3.6   
Target Milestone: 3.7 M2   
Hardware: PC   
OS: Windows XP   
Whiteboard:
Attachments:
Description Flags
comparing tags for o.e.team.ui
none
Fix v01
none
mylyn/context/zip none

Description Arno Unkrig CLA 2010-08-24 10:02:06 EDT
Build Identifier: 3.6.0 I20100608-0911

Occurrs only iff the "second" version is a tag that contains a hyphen ("-"). The CVS client does not recognize the line

M File tqf/xcobol/kon/tq-qf-speichermanager.kon is new; REL-2010-R3 revision 1.17

produced by the server, because the tag ("REL-2010-R3") does not match IMessagePatterns.TAG_PATTERN ("\\w*").

TAG_PATTERN should be relaxed to also allow hyphens, as described in

http://ximbiot.com/cvs/manual/cvs-1.11.23/cvs_4.html#SEC48



Reproducible: Always

Steps to Reproduce:
1. Open the "CVS Repositories" view
2. Select two Versions, e.g. "Versions / tqf / REL-2010-R2" and "Versions / tqf / REL-2010-R3"
3. Right click, "Compare"
4. The "Structure Compare" view show only the CHANGED files, not the NEW and DELETED files
Comment 1 Arno Unkrig CLA 2010-08-24 10:35:35 EDT
"\\w*" should probably be replaced with "[\\w\\-]*".
Comment 2 Tomasz Zarna CLA 2010-08-24 11:21:05 EDT
Created attachment 177331 [details]
comparing tags for o.e.team.ui

This seems to be working just fine for org.eclipse.team.ui at dev.eclipse.org. I'm on I20100817-0800 but the pattern is the same as in I20100608-0911. Did I miss something?
Comment 3 Arno Unkrig CLA 2010-08-24 12:24:51 EDT
Important: You must compare TWO REMOTE versions, not the local version and one remote version.

If you

 * open the "CVS Repositories" view
 * then navigate to ":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse /
      Versions / org.eclipse.team.ui"
 * then select both "I20100817-0800" and "I20100513-0630" (multiple selection)
 * then right-click / "Compare"
 * then you will only get CHANGED files

But actually, file "SynchronizeAndRefreshAction.java" was added.
Comment 4 Tomasz Zarna CLA 2010-08-25 06:14:54 EDT
Created attachment 177401 [details]
Fix v01

Yup, you're right. Here is comment 1 forged into a patch.
Comment 5 Tomasz Zarna CLA 2010-08-25 06:14:56 EDT
Created attachment 177402 [details]
mylyn/context/zip
Comment 6 Arno Unkrig CLA 2010-08-26 03:14:54 EDT
Is there a chance to get the fix into SR1 (September 24, 2010) or SR2 (February 25, 2011)?
Comment 7 Tomasz Zarna CLA 2010-08-26 04:29:56 EDT
No, we usually backport only severe issues which lead to crashes, data loss or at least major loss of function. If the bug is a regression it's also more probable it will be backported. If we hadn't kept to these strict rules we would have ended up in backporting all major bugs, which doesn't make much sense to me.
Comment 8 Tomasz Zarna CLA 2010-08-31 08:59:31 EDT
Fixed in HEAD. Available in builds >=N20100831-20000. Thanks for the tip Arno! Could you please verify it in the upcoming nightly build?
Comment 9 Arno Unkrig CLA 2010-09-09 03:43:37 EDT
Hi Tomasz,

tested the patch and it works fine! "SynchronizeAndRefreshAction.java" now appears in the DIFF (with a "+" sign).

Thanks a lot...


Arno
Comment 10 Tomasz Zarna CLA 2010-09-09 04:30:29 EDT
No worries. I'm glad I could help. Marking as verified.