| <!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"> |
| <title>Compare/Patch</title> |
| <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> |
| <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> |
| </head> |
| <body bgcolor="#FFFFFF"> |
| <h1 class="Head">Compare/Patch</h1> |
| <p>The following preferences can be changed on the <a class="command-link" href= |
| 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.compare.internal.ComparePreferencePage)")'> |
| <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <strong>General > |
| Compare/Patch</strong></a> preference page.</p> |
| <h2>General options</h2> |
| <table border="1" cellspacing="0" style="width: 100%;"> |
| <tbody> |
| <tr> |
| <th width="25%"> |
| <div class="Para"> |
| Option |
| </div> |
| </th> |
| <th> |
| <div class="Para"> |
| Description |
| </div> |
| </th> |
| <th> |
| <div class="Para"> |
| Default |
| </div> |
| </th> |
| </tr> |
| <tr> |
| <td align="left" valign="top" width="25%"> |
| <div class="Para"> |
| Open structure compare automatically |
| </div> |
| </td> |
| <td align="left" valign="top"> |
| <div class="Para"> |
| <div class="Para"> |
| This option controls whether a structure compare is automatically performed whenever a content compare is |
| done. Turn this option off if you don't want to see the structural differences. |
| </div> |
| </div> |
| </td> |
| <td align="left" valign="top"> |
| <div class="Para"> |
| On |
| </div> |
| </td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">Show structure compare in Outline view when possible</td> |
| <td style="vertical-align: top;">If this option is on, structure compare will be displayed in the Outline view |
| whenever it is possible.</td> |
| <td style="vertical-align: top;">Off</td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">Show additional compare information in the status line</td> |
| <td style="vertical-align: top;">If this option is on, additional information about a change is shown in the |
| status line. Turn this option on if you are interested in additional information about a change.</td> |
| <td style="vertical-align: top;">Off</td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">Ignore white space</td> |
| <td style="vertical-align: top;">This option controls whether or not whitespace change are shown in the compare |
| viewer. Turn this option on if you want to see changes in whitespace.</td> |
| <td style="vertical-align: top;">Off</td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">Automatically save dirty editors before browsing patches</td> |
| <td style="vertical-align: top;">This option controls whether any unsaved changes are automatically saved |
| before a patch is applied. Turn this option on if you want to save changes automatically.</td> |
| <td style="vertical-align: top;">Off</td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">Added/Removed lines</td> |
| <td style="vertical-align: top;">These options control which lines should be counted as added and removed lines |
| when applying a patch. Both options are based on regular expressions.</td> |
| <td style="vertical-align: top;"><br></td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">Filtered Members</td> |
| <td style="vertical-align: top;"> |
| <p>This option allows you to filter members that should be excluded from 'Compare With Each Other'.</p> |
| <p><strong>Note:</strong> The names in the list must be separated by a comma.</p> |
| </td> |
| <td style="vertical-align: top;"><br></td> |
| </tr> |
| </tbody> |
| </table> |
| <h2>Text Compare options</h2> |
| <table border="1" cellspacing="0" style="width: 100%;"> |
| <tbody> |
| <tr> |
| <th width="25%"> |
| <div class="Para"> |
| Option |
| </div> |
| </th> |
| <th> |
| <div class="Para"> |
| Description |
| </div> |
| </th> |
| <th> |
| <div class="Para"> |
| Default |
| </div> |
| </th> |
| </tr> |
| <tr> |
| <td align="left" valign="top" width="25%"> |
| <div class="Para"> |
| Synchronize scrolling between panes in compare viewers |
| </div> |
| </td> |
| <td align="left" valign="top"> |
| <div class="Para"> |
| <div class="Para"> |
| The two comparison viewers will "lock scroll" along with one another in order to keep identical and |
| corresponding portions of the code in each pane side-by-side. Turn this option off if you do not want the |
| compare viewers to lock scroll. |
| </div> |
| </div> |
| </td> |
| <td align="left" valign="top"> |
| <div class="Para"> |
| On |
| </div> |
| </td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">Initially show ancestor pane</td> |
| <td style="vertical-align: top;">Sometimes you want to compare two versions of a resource with the previous |
| version from which they were both derived. This is called their <i>common ancestor</i>, and it appears in its |
| own comparison pane during a three way compare. Turn this option on if you want the ancestor pane to always |
| appear at the start of a comparison.</td> |
| <td style="vertical-align: top;">Off</td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">Show pseudo conflicts</td> |
| <td style="vertical-align: top;">Displays pseudo conflicts, which occur when two developers make the same |
| change (for example, both add or remove the exact same line of code or comment). Turn this option on if you |
| want pseudo conflicts to appear in compare browsers.</td> |
| <td style="vertical-align: top;">Off</td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">Connect ranges with single line</td> |
| <td style="vertical-align: top;">Controls whether differing ranges are visually connected by a single line or a |
| range delimited by two lines.</td> |
| <td style="vertical-align: top;">On</td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">Highlight individual changes</td> |
| <td style="vertical-align: top;">Controls whether the individual changes inside conflicts are highlighted.</td> |
| <td style="vertical-align: top;">On</td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">Disable capping when comparing large documents</td> |
| <td style="vertical-align: top;">The capping mechanism is used to speed up finding differences in large files. |
| In case where the capping happens the result can either be correct or it can display too many changes, but it |
| never misses any change. Turn this option on, if you prefer a precise result in favour of possibly longer |
| calculation time.</td> |
| <td style="vertical-align: top;">Off</td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">When the end/beginning is reached while navigating an element</td> |
| <td style="vertical-align: top;"> |
| Use this option to configure what occurs when the end/beginning is reached while navigating an element. |
| <ul> |
| <li><strong>Prompt:</strong> If this option is on and you selected to compare a single element you will be |
| asked whether you want to go to the beginning/end of the element after the end/beginning is reached. If you |
| are comparing two or more elements you will be asked whether you want to go to the beginning/end of the |
| current element or to go to the next/previous element. Moreover, if you choose to remember your decision, |
| this option will be changed to one of the below respectively.</li> |
| <li><strong>Loop back to the beginning/end:</strong> When this option is on, the selection will me moved |
| back to the beginning/end after you reach the end/beginning of an element.</li> |
| <li><strong>Go to the next/previous element:</strong> If you are comparing two or more elements and this |
| option is on after you reach the end/beginning of an element the next/previous element will be opened.</li> |
| </ul> |
| </td> |
| <td style="vertical-align: top;">Prompt</td> |
| </tr> |
| </tbody> |
| </table> |
| <h3 class="related">Related reference</h3><a href="ref-25.htm">Compare Editor</a> |
| </body> |
| </html> |
