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

Bug 126340

Summary: Inconsistent: Compare / Head vs. Compare / Branch / Head
Product: [Eclipse Project] Platform Reporter: Andreas Krüger <andreas.krueger>
Component: CVSAssignee: platform-cvs-inbox <platform-cvs-inbox>
Status: RESOLVED DUPLICATE QA Contact:
Severity: normal    
Priority: P3    
Version: 3.1.1   
Target Milestone: ---   
Hardware: PC   
OS: Windows 2000   
Whiteboard:

Description Andreas Krüger CLA 2006-02-03 09:08:42 EST
This reports a bug of the CVS workspace / repository compare functionality.

  Compare With / Latest from Head
and
  Compare With / Another branch or version... / HEAD
sometimes lead to inconsistent results.

This happens when most files in the project are on HEAD, but some are on a (different) branch.

Here is the full story:

Background: I have to adjust a few config files for some personalized tests.

Checked out the entire project (sources and config files) from CVS HEAD. Opened a branch for my private settings. Fiddled with those config files. Checked in my config file changes, to my private branch.

Deleted the workspace.

Checked out the entire project from CVS HEAD again. Merged my few config file changes into my workspace.

Found those few config files I had changed. For each individual file, I did:

Team /
Switch to another branch or version /
Select the tag from the following list /
(my private branch).

I then used "override and update" on each file to make sure the workspace content is exactly the content in the private branch's latest revision. Well, it already was - but through "override and update" the Eclipse CVS GUI also learned that fact.

So now, what is the situation? I have switched a few files to my private branch. The content of each file is the same as the latest content from that branch, but different from the latest content from HEAD. Everything else is the same as the latest content from HEAD.

In this situation,
  Compare with / latest from HEAD
(wrongly) finds no changes.

  Compare With / Another branch or version... / HEAD
does find my few config file changes.

This I consider a bug. The two should lead to the same results.

Possible fix: Simply rename "Compare with / latest from HEAD" to
"Compare with / latest from Repository". At least, if that is what it does.

Besides the consistency issue, the functionality "Compare with / latest from Repository" would be nice to have, indeed. There should be a "Compare" operation that tells me "no changes" in my situation.

Regards, and thank you for providing fine software.
Comment 1 Michael Valenta CLA 2006-02-14 08:49:43 EST
CVS just doesn't deal with mixed tags very well

*** This bug has been marked as a duplicate of 75070 ***