Attachment #192071 for bug #341114




      <description>Sets the amount of time in seconds to wait before timing out from a connection to the CVS server.</description>
   	</context>
   	
   	<context  id="consider_content_pref" >
      <description>Sets the default compare method for comparing and synchronizing CVS resources. By default timestamps are used to compare CVS files, and this is by far the fastest method. However, in some cases a more accurate comparison can be achieved by comparing file content. This setting can be toggled from within a compare editor or the synchronization view.</description>
   	</context>
   	
	<context  id="replace_deletion_of_unmanaged_pref" >
      <description>Allows resources not under CVS control to be deleted when replacing with resources from the repository.</description>
   	</context>

   	
    <context  id="cvs_compare_preference_page_context" >
      <description>This page allows you to configure various aspects of CVS synchronizations and comparisons.</description>
      <topic label="CVS Synchronize/Compare preferences" href="reference/ref-19cvs-sync.htm"/>
      <topic label="CVS Workspace Synchronization" href="reference/ref-33.htm"/>
   	</context>
   	
   	<context  id="general_preference_page_context" >




<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html lang="en"><head>

<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">

<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta http-equiv="Content-Style-Type" content="text/css"><link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"><title>CVS Synchronize/Compare Preferences</title>
<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>																						  
</head>


<body bgcolor="#ffffff">
<h1 class="Head">CVS Synchronize/Compare Preferences</h1>
<p class="Para">The following preferences can be changed on the

  <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.ComparePreferences)")'>

    </tr>
  </thead>
  <tbody><tr> 
    <td align="left" valign="top" width="21%">Consider file contents in remote comparisons</td>
    <td align="left" valign="top" width="58%">For more precise comparison, 
      the contents can be compared. If performance is an issue this can be disabled 
      to use the much faster time stamp based comparison. This option only applies 
      to comparisons of remote resources or when comparing a selected project or folder 
      with a branch or version. For the later case the option is only respected 
      when displaying model elements is disabled.</td>
      to comparisons and merges but not Workspace synchronizations.</td>
    <td align="left" valign="top" width="21%">Enabled</td>
  </tr>
  <tr> 




/*******************************************************************************
 * Copyright (c) 2000, 2011 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.compare.CompareUI;
import org.eclipse.jface.preference.BooleanFieldEditor;
import org.eclipse.jface.preference.IPreferencePageContainer;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.team.internal.ui.SWTUtils;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;

/**

		        ICVSUIConstants.PREF_CONSIDER_CONTENTS, 
				CVSUIMessages.ComparePreferencePage_4,  
				BooleanFieldEditor.DEFAULT, 
 getFieldEditorParent()));
            protected Button getChangeControl(Composite parent) {
                Button button = super.getChangeControl(parent);
                PlatformUI.getWorkbench().getHelpSystem().setHelp(button, IHelpContextIds.PREF_CONSIDER_CONTENT);
                return button;
            }
		});
		addField(new BooleanFieldEditor(
		        ICVSUIConstants.PREF_SHOW_COMPARE_REVISION_IN_DIALOG, 
		        CVSUIMessages.ComparePreferencePage_3,  

Lines 1-5 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java (-2 / +1 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2010 IBM Corporation and others.	2	* Copyright (c) 2000, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 89-95 Link Here
89	public static final String PREF_KEYWORDMODE = PREFIX + "default_keywordmode_pref"; //$NON-NLS-1$	89	public static final String PREF_KEYWORDMODE = PREFIX + "default_keywordmode_pref"; //$NON-NLS-1$
90	public static final String PREF_LINEEND = PREFIX + "line_end_pref"; //$NON-NLS-1$	90	public static final String PREF_LINEEND = PREFIX + "line_end_pref"; //$NON-NLS-1$
91	public static final String PREF_COMMS_TIMEOUT = PREFIX + "comms_timeout_pref"; //$NON-NLS-1$	91	public static final String PREF_COMMS_TIMEOUT = PREFIX + "comms_timeout_pref"; //$NON-NLS-1$
92	public static final String PREF_CONSIDER_CONTENT = PREFIX + "consider_content_pref"; //$NON-NLS-1$
93	public static final String PREF_REPLACE_DELETE_UNMANAGED = PREFIX + "replace_deletion_of_unmanaged_pref"; //$NON-NLS-1$	92	public static final String PREF_REPLACE_DELETE_UNMANAGED = PREFIX + "replace_deletion_of_unmanaged_pref"; //$NON-NLS-1$
94	public static final String PREF_SAVE_DIRTY_EDITORS = PREFIX + "save_dirty_editors_pref"; //$NON-NLS-1$	93	public static final String PREF_SAVE_DIRTY_EDITORS = PREFIX + "save_dirty_editors_pref"; //$NON-NLS-1$
95	public static final String PREF_CHANGE_PERSPECTIVE_ON_SHOW_ANNOTATIONS = PREFIX + "change_perspective_on_show_annotations"; //$NON-NLS-1$	94	public static final String PREF_CHANGE_PERSPECTIVE_ON_SHOW_ANNOTATIONS = PREFIX + "change_perspective_on_show_annotations"; //$NON-NLS-1$

Lines 1024-1030 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/messages.properties (-1 / +1 lines)
1024	ComparePreferencePage_1=Show the &file author in compare editors	1024	ComparePreferencePage_1=Show the &file author in compare editors
1025	ComparePreferencePage_2=Automatically enable chan&ge set grouping in CVS synchronizations	1025	ComparePreferencePage_2=Automatically enable chan&ge set grouping in CVS synchronizations
1026	ComparePreferencePage_3=Show revision &comparisons in a dialog	1026	ComparePreferencePage_3=Show revision &comparisons in a dialog
1027	ComparePreferencePage_4=Con&sider file contents in comparisons	1027	ComparePreferencePage_4=Con&sider file contents in remote comparisons
1028	ComparePreferencePage_6=See <a>''{0}''</a> for compare editor preferences.	1028	ComparePreferencePage_6=See <a>''{0}''</a> for compare editor preferences.
1029	ComparePreferencePage_7=Allow &models (e.g. Java) to participate in synchronizations	1029	ComparePreferencePage_7=Allow &models (e.g. Java) to participate in synchronizations
1030	ComparePreferencePage_8=&Open a compare editor when comparing a single file	1030	ComparePreferencePage_8=&Open a compare editor when comparing a single file

Return to bug 341114

Lines 496-505 Link Here

(-)contexts_Team_CVS.xml (-5 / +2 lines)
496	<description>Sets the amount of time in seconds to wait before timing out from a connection to the CVS server.</description>	496	<description>Sets the amount of time in seconds to wait before timing out from a connection to the CVS server.</description>
497	</context>	497	</context>
498		498
499	<context id="consider_content_pref" >
500	<description>Sets the default compare method for comparing and synchronizing CVS resources. By default timestamps are used to compare CVS files, and this is by far the fastest method. However, in some cases a more accurate comparison can be achieved by comparing file content. This setting can be toggled from within a compare editor or the synchronization view.</description>
501	</context>
502
503	<context id="replace_deletion_of_unmanaged_pref" >	499	<context id="replace_deletion_of_unmanaged_pref" >
504	<description>Allows resources not under CVS control to be deleted when replacing with resources from the repository.</description>	500	<description>Allows resources not under CVS control to be deleted when replacing with resources from the repository.</description>
505	</context>	501	</context>
Lines 587-593 Link Here
587		583
588	<context id="cvs_compare_preference_page_context" >	584	<context id="cvs_compare_preference_page_context" >
589	<description>This page allows you to configure various aspects of CVS synchronizations and comparisons.</description>	585	<description>This page allows you to configure various aspects of CVS synchronizations and comparisons.</description>
590	<topic label="CVS Synchronize view" href="reference/ref-33.htm"/>	586	<topic label="CVS Synchronize/Compare preferences" href="reference/ref-19cvs-sync.htm"/>
		587	<topic label="CVS Workspace Synchronization" href="reference/ref-33.htm"/>
591	</context>	588	</context>
592		589
593	<context id="general_preference_page_context" >	590	<context id="general_preference_page_context" >

Lines 1-16 Link Here

(-)reference/ref-19cvs-sync.htm (-11 / +10 lines)
1	<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">	1	<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
2	<html lang="en"><head>	2	<html lang="en"><head>
3		3
4	<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">	4	<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
5		5
6	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">	6	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
7	<meta http-equiv="Content-Style-Type" content="text/css"><link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"><title>CVS Synchronize/Compare</title>	7	<meta http-equiv="Content-Style-Type" content="text/css"><link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"><title>CVS Synchronize/Compare Preferences</title>
8	<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>	8	<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
9	</head>	9	</head>
10		10
11		11
12	<body bgcolor="#ffffff">	12	<body bgcolor="#ffffff">
13	<h1 class="Head">CVS Synchronize/Compare</h1>	13	<h1 class="Head">CVS Synchronize/Compare Preferences</h1>
14	<p class="Para">The following preferences can be changed on the	14	<p class="Para">The following preferences can be changed on the
15		15
16	<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.ComparePreferences)")'>	16	<a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.ComparePreferences)")'>
Lines 27-40 Link Here
27	</tr>	27	</tr>
28	</thead>	28	</thead>
29	<tbody><tr>	29	<tbody><tr>
30	<td align="left" valign="top" width="21%">Consider file contents in comparisons</td>	30	<td align="left" valign="top" width="21%">Consider file contents in remote comparisons</td>
31	<td align="left" valign="top" width="58%"> Use this option to compare contents	31	<td align="left" valign="top" width="58%">For more precise comparison,
32	for changed files found when comparing CVS resources. Usually, time stamps	32	the contents can be compared. If performance is an issue this can be disabled
33	are used to compare CVS files, and this is by far the fastest method. However,	33	to use the much faster time stamp based comparison. This option only applies
34	in some cases a more accurate comparison can be achieved by comparing file	34	to comparisons of remote resources or when comparing a selected project or folder
35	content. Disabling this option will speed up comparisons but may result	35	with a branch or version. For the later case the option is only respected
36	in compare entries whose contents are the same. This option only applies	36	when displaying model elements is disabled.</td>
37	to comparisons and merges but not Workspace synchronizations.</td>
38	<td align="left" valign="top" width="21%">Enabled</td>	37	<td align="left" valign="top" width="21%">Enabled</td>
39	</tr>	38	</tr>
40	<tr>	39	<tr>