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

Bug 341114

Summary: 'Consider file contents in comparison' option needs clarification
Product: [Eclipse Project] Platform Reporter: Dani Megert <daniel_megert>
Component: CVSAssignee: Tomasz Zarna <tomasz.zarna>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: remy.suen
Version: 3.2Keywords: Documentation, polish
Target Milestone: 3.7 M7Flags: daniel_megert: review+
Hardware: PC   
OS: Windows XP   
Whiteboard:
Attachments:
Description Flags
Fix v01
none
mylyn/context/zip
none
Improved fix
none
Improved fix none

Description Dani Megert CLA 2011-03-28 10:50:18 EDT 
'Consider file contents in comparison' option needs clarification:
- The preference does not work for all comparisons
  ==> need to clarify this, maybe even change the label.
- F1 help says "By default timestamps are used to compare CVS files" but the
  preference is enabled and the help document says something else.
  ==> we should synchronize F1 and doc and not use "By default" or "Usually".
- It seems to matter whether model based comparison is used or not.
- CVS Compare started via History view seems to ignore the preference and always
  use content based compare (see bug 315747 comment 8).

See bug 315747 for all the details.
Comment 1 Tomasz Zarna CLA 2011-03-28 12:24:14 EDT 
Created attachment 192022 [details]
Fix v01

First version, will review again tomorrow morning. I'm done for today.
Comment 2 Tomasz Zarna CLA 2011-03-28 12:24:17 EDT 
Created attachment 192023 [details]
mylyn/context/zip
Comment 3 Dani Megert CLA 2011-03-29 05:22:38 EDT 
Created attachment 192070 [details]
Improved fix
Comment 4 Dani Megert CLA 2011-03-29 05:24:40 EDT 
Tomek, your fix looks good. I've improved it only a little bit:
- Added link to preference page help on the F1 page.
- Removed special F1 help for the first checkbox as this was easy to get and not
  common to have individual F1 help for each widget on the pref page.
Comment 5 Dani Megert CLA 2011-03-29 05:30:53 EDT 
Created attachment 192071 [details]
Improved fix
Comment 6 Tomasz Zarna CLA 2011-03-29 06:04:07 EDT 
Latest fix has been applied to HEAD with a minor change: to be consistent with titles of other CVS pref page docs I removed the "Preferences" Dani added. I left the label in the link untouched. Thanks again!

Available in builds >=I20110329-0800.