| <!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=utf-8"> |
| <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" type="text/javascript"></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.svg" alt="command link"> <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%">Only look at timestamps to detect changes</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 enabled 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. The option is not honored in synchronizations launched using the <b>Team > Synchronize</b> menu |
| command, the <b>Synchronize</b> toolbar command or the <b>Compare With > Latest From |
| <branch/version></b> menu command.</td> |
| <td align="left" valign="top" width="21%">Disabled</td> |
| </tr> |
| <tr> |
| <td align="left" valign="top">Regular expression to ignore changes in synchronizations</td> |
| <td align="left" valign="top">This option controls which changes should be ignored during content-based |
| synchronizations i.e. when <b>Only look at timestamps to detect changes</b> is disabled. If at least one side |
| of the change matches the defined regular expression, the change will be ignored.</td> |
| <td align="left" valign="top"></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> |
| <h3 class="related">Related reference</h3><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> |
| </body> |
| </html> |