| <!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>Setting preferences for comparing files</title> |
| <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"> </script> |
| </HEAD> |
| |
| <BODY BGCOLOR="#ffffff"> |
| <H1>Setting preferences for comparing files</H1> |
| |
| <P>When you select to compare or synchronize two or more resources in the |
| Workbench, one or more comparison editors usually open. To customize how these |
| editors behave: |
| </P> |
| |
| <ol> |
| <li>Open 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"> |
| <b>General > Compare/Patch</b></a> preference page.</li> |
| <li>Set your preferences and click <b>OK</b>.</li> |
| </ol> |
| |
| <p CLASS="Para">You can configure the following options on the <b>General</b> tab. |
| </p> |
| |
| <TABLE BORDER="1" cellspacing="0" width="540" cellpadding="5"> |
| <THEAD> |
| <TR> |
| <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Option</P></TH> |
| <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Description</P></TH> |
| <TH ROWSPAN="1" COLSPAN="1"> <P CLASS="Para"> Default</P></TH> |
| </TR> |
| </THEAD> |
| <TBODY> |
| <TR> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Open structure compare automatically</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Makes an additional information area visible which shows differences |
| in the underlying structure of the resources being compared. This information |
| may not be available for all comparisons.</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| On</P></TD> |
| </TR> |
| <TR> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"><P CLASS="Para"> |
| Show structure compare in Outline view when possible</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| If this option is on, structure compare will be displayed in the Outline |
| view whenever it is possible.</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Off</P></TD> |
| </TR> |
| <TR> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Show additional compare information in the status line</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Causes the status line to display additional context information about |
| the comparison.</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Off</P></TD> |
| </TR> |
| <TR> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Ignore white space</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para">Causes |
| the comparison to ignore differences which are whitespace characters |
| (spaces, tabs, etc.). Also causes differences in line terminators ( |
| LF versus CRLF) to be ignored.</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Off</P></TD> |
| </TR> |
| <TR> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Automatically save dirty editors before patching</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| This option controls whether any unsaved changes are automatically saved before |
| a patch is applied.</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Off</P></TD> |
| </TR> |
| </TBODY> |
| </TABLE> |
| |
| <p CLASS="Para">You can configure the following options in the <b>Text Compare</b> tab. |
| </p> |
| |
| <TABLE BORDER="1" cellspacing="0" width="540" cellpadding="5"> |
| <THEAD> |
| <TR> |
| <TH width="122" COLSPAN="1" ROWSPAN="1"> <P CLASS="Para"> Option</P></TH> |
| <TH width="327" COLSPAN="1" ROWSPAN="1"> <P CLASS="Para"> Description</P></TH> |
| <TH width="53" COLSPAN="1" ROWSPAN="1"> <P CLASS="Para"> Default</P></TH> |
| </TR> |
| </THEAD> |
| <TBODY> |
| <TR> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Synchronize scrolling between panes in compare viewers</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| The two compare 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.</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| On</P></TD> |
| </TR> |
| |
| <TR> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> |
| <P CLASS="Para"> Initially show ancestor pane</P> |
| </TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> |
| <P CLASS="Para">Sometimes you may 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 comparison.</P> |
| </TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> |
| <P CLASS="Para"> |
| Off</P> |
| </TD> |
| </TR> |
| <TR> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Show pseudo conflicts</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Displays conflicts that occur when two developers make the same change, |
| for example when both add or remove the same line of code.</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Off</P></TD> |
| </TR> |
| <TR> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Connect ranges with single line</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Controls whether differing ranges are visually connected by a single |
| line or a range delimited by two lines.</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| On</P></TD> |
| </TR> |
| <TR> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Highlight individual changes</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Controls whether the individual changes inside conflicts are highlighted |
| .</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| On</P></TD> |
| </TR> |
| <TR> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| When the end/beginning is reached while navigating an element</P></TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Use this option to configure what occurs when |
| the end/beginning is reached while navigating an element. The options are:</P> |
| <ul> |
| <li>Prompt</li> |
| <li>Loop back to the beginning/end</li> |
| <li>Go to the next/previous element</li> |
| </ul> |
| </TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> <P CLASS="Para"> |
| Prompt</P></TD> |
| </TR> |
| </TBODY> |
| </TABLE> |
| |
| <p><img border="0" src="../images/ngrelc.png" alt="Related concepts" ><br> |
| <a href="../concepts/concepts-29.htm">Three way comparisons</a> |
| </p> |
| |
| <p><img border="0" src="../images/ngrelt.png" alt="Related tasks" ><br> |
| <a href="tasks-68.htm">Comparing resources</a><br> |
| <a href="tasks-115.htm">Synchronizing with the repository</a><br> |
| <a href="tasks-68dg.htm">Merging changes in the Compare editor</a> |
| </p> |
| |
| <p><img border="0" src="../images/ngrelr.png" alt="Related references" > |
| <br><a href="../reference/ref-25.htm">Compare editor</a> |
| <br><a href="../reference/ref-11.htm">Compare/Patch preferences</a> |
| </p> |
| |
| |
| |
| </BODY> |
| </HTML> |
