| <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> |
| <html> |
| <head> |
| <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"> |
| </head> |
| <body bgcolor="#FFFFFF"> |
| |
| <h1 CLASS="Head"> |
| Compare/Patch</h1> |
| |
| <div CLASS="Para"></div> |
| |
| <div CLASS="Para">The following preferences can be changed on the Compare/Patch |
| page.</div> |
| |
| <br> |
| <table BORDER CELLSPACING=0 > |
| <caption><THEAD> |
| </THEAD><TBODY> |
| </TBODY></caption> |
| |
| <center><h2>General options</h2></center> |
| <tr> |
| <th> |
| <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> |
| <div CLASS="Para">Open structure compare automatically</div> |
| </td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">This option controls whether a structure compare |
| is automatically performed whenever a content compare is done.</div> |
| <p CLASS="Para">Turn this option off if you don't want to see the structural differences. |
| </td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">On</div> |
| </td> |
| </tr> |
| |
| <tr> |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">Show additional compare information in the status line</div> |
| </td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">If this option is on, additional information about a change is shown in |
| the status line.</div> |
| <p CLASS="Para">Turn this option on if you are interested in additional information about a change.</td> |
| </td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">Off</div> |
| </td> |
| </tr> |
| |
| <tr> |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">Ignore white space</div> |
| </td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">This option controls whether or not whitespace change |
| are shown in the compare viewer.</div> |
| |
| |
| <p CLASS="Para">Turn this option on if you want to see changes in whitespace.</td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">Off</div> |
| </td> |
| </tr> |
| |
| |
| <tr> |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">Automatically save dirty options before patching</div> |
| </td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">This option controls whether any unsaved changes are automatically |
| saved before a patch is applied.</div> |
| |
| <p CLASS="Para">Turn this option on if you want to save changes automatically.</td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">Off</div> |
| </td> |
| </tr> |
| |
| |
| |
| </table> |
| |
| <p> |
| <br> |
| <table BORDER CELLSPACING=0 > |
| <caption><THEAD> |
| </THEAD><TBODY> |
| </TBODY></caption> |
| <center><h2>Text Compare options</h2></center> |
| <tr> |
| <th> |
| <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> |
| <div CLASS="Para">Synchronize scrolling between panes in compare viewers</div> |
| </td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <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.</div> |
| |
| |
| <p CLASS="Para">Turn this option off if you do not want the compare viewers |
| to lock scroll.</td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">On</div> |
| </td> |
| </tr> |
| |
| <tr> |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">Initially show ancestor pane</div> |
| </td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">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.</div> |
| |
| |
| <p CLASS="Para">Turn this option on if you want the ancestor pane to always |
| appear at the start of a comparison.</td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">Off</div> |
| </td> |
| </tr> |
| |
| <tr> |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">Show pseudo conflicts</div> |
| </td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">Displays pseudo conflicts, which occur when two developers |
| make the same change (e.g., both add or remove the exact same line of code |
| or comment). </div> |
| |
| |
| <p CLASS="Para">Turn this option on if you want pseudo conflicts to appear |
| in compare browsers.</td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">Off</div> |
| </td> |
| </tr> |
| |
| <tr> |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">Connect ranges with single line</div> |
| </td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">Controls whether differing ranges are visually connected by a single line or |
| a range delimited by two lines.</div> |
| </td> |
| |
| <td ALIGN=LEFT VALIGN=TOP> |
| <div CLASS="Para">On</div> |
| </td> |
| </tr> |
| </table> |
| |
| <p>Here is what the Compare preference page looks like: |
| <p><img src="../images/Image219_pref_cv.gif" alt="Compare preference page" border="0" width="607" height="541"> |
| |
| <P><img border="0" src="../images/ngrelr.gif" alt="Related reference" width="159" height="27"> |
| <br><a href="ref-25.htm">Compare Editor</a> |
| <br><a href="ref-33.htm">CVS Synchronization View</a> |
| </P> |
| <p> <br> |
| |
| <p><a href="../hglegal2003.htm"><img src="../images/ngibmcpy2003.gif" alt="Copyright IBM Corporation and others 2000, 2003" border="0" width="324" height="14"></a> |
| </body> |
| </html> |
