| <!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"> |
| <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"></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.png"> |
| <strong>General > Compare/Patch</strong></a> |
| |
| page.</p> |
| |
| <h2>General options</h2> |
| <table border="1" cellspacing="0" style="width: 100%;"> |
| <caption> |
| </caption> |
| <thead> |
| </thead> |
| <tbody> |
| </tbody> |
| <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<br> |
| </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<br> </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<br> |
| the status line. Turn this option on if you are interested in additional |
| information about a change.<br> </td> |
| <td style="vertical-align: top;">Off<br> </td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">Ignore white space<br> </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.<br> </td> |
| <td style="vertical-align: top;">Off<br> </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.<br> </td> |
| <td style="vertical-align: top;">Off<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.<br> |
| </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%;"> |
| <caption> |
| </caption> |
| <thead> |
| </thead> |
| <tbody> |
| </tbody> |
| <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<br> |
| </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.<br> </td> |
| <td style="vertical-align: top;">Off<br> </td> |
| </tr> |
| <tr> |
| <td style="vertical-align: top; width: 25%;">Show pseudo conflicts<br> </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.<br> </td> |
| <td style="vertical-align: top;">Off<br> </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.<br> </td> |
| <td style="vertical-align: top;">On<br> </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.<br></td> |
| <td style="vertical-align: top;">On<br> </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<br> </td> |
| </tr> |
| |
| |
| |
| </tbody> |
| </table> |
| |
| |
| <p>Here is what the Compare preference page looks like:</p> |
| <p><img src="../images/Image219_pref_cv.png" alt="Compare preference page (General tab)" border="0" ></p> |
| <p><img src="../images/Image219_pref_cv2.png" alt="Compare preference page (Text Compare tab)" border="0" ></p> |
| |
| <P><img border="0" src="../images/ngrelr.png" alt="Related reference" > |
| <br><a href="ref-25.htm">Compare Editor</a> |
| <br><a href="ref-33.htm">CVS Synchronization View</a> |
| </P> |
| |
| </body> |
| </html> |
