| <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> |
| <html><head> |
| |
| <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."> |
| |
| <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</title> |
| <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script> |
| </head> |
| |
| |
| <body bgcolor="#ffffff"> |
| <h1 class="Head">CVS Synchronize/Compare</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)")'> |
| <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png"> |
| <strong>Team > CVS > Synchronize/Compare</strong></a> |
| |
| preference page.</p> |
| <table border="1" cellspacing="0" width="100%"> |
| <thead> |
| <tr> |
| <th width="164"> <p class="Para">Option</p></th> |
| <th width="490"> <p class="Para">Description</p></th> |
| <th width="152"> <p class="Para">Default</p></th> |
| </tr> |
| </thead> |
| <tbody><tr> |
| <td align="left" valign="top" width="21%">Consider file contents in comparisons</td> |
| <td align="left" valign="top" width="58%"> Use this option to compare contents |
| for changed files found when comparing CVS resources. Usually, time stamps |
| 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. Disabling this option will speed up comparisons but may result |
| in compare entries whose contents are the same. This option only applies |
| to comparisons and merges but not Workspace synchronizations.</td> |
| <td align="left" valign="top" width="21%">Enabled</td> |
| </tr> |
| <tr> |
| <td align="left" valign="top">Show revision comparisons in dialog</td> |
| <td align="left" valign="top">Use this this option to show revision comparisons |
| in a dialog instead of a compare editor.</td> |
| <td align="left" valign="top">Disabled</td> |
| </tr> |
| <tr> |
| <td align="left" valign="top">Automatically enable change set grouping in CVS synchronizations</td> |
| <td align="left" valign="top">Use the option to have change sets enabled by |
| default in those CVS synchronizations that support them.</td> |
| <td align="left" valign="top">Disabled</td> |
| </tr><tr> |
| <td style="vertical-align: top;">Allow models (e.g. Java) to participate in synchronizations<br> |
| </td> |
| <td style="vertical-align: top;">Use this option to display model |
| elements (such as Java packages) in the sync view. If this |
| element is disabled, only resources will be shown in the sync view.<br> |
| </td> |
| <td style="vertical-align: top;">Enabled<br> |
| </td> |
| </tr> |
| <tr> |
| <td align="left" valign="top">Open a compare editor when comparing a single file</td> |
| <td align="left" valign="top">Use this this option to open a compare editor when comparing a single file. |
| If disabled, the results of the comparison will be displayed in the Synchronize view.</td> |
| <td align="left" valign="top">Enabled</td> |
| </tr> |
| |
| </tbody></table> |
| <p>Here is what the preference page looks like:</p> |
| <p><img alt ="Synchronize/Compare preference page" src="../images/cvs-sync-compare.png"></p> |
| <p><img alt="Related reference" src="../images/ngrelr.png" border="0"><br> |
| <a href="ref-19.htm">Team</a><br> |
| <a href="ref-33.htm">CVS Workspace Synchronization</a><br> |
| <a href="ref-33a.htm">CVS Merge Synchronization</a></p> |
| |
| </body></html> |
