| <!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"> |
| <LINK REL="STYLESHEET" HREF="../book.css" CHARSET="ISO-8859-1" TYPE="text/css"> |
| <title>Comparing resources</title> |
| </HEAD> |
| |
| <BODY BGCOLOR="#ffffff"> |
| <H1>Comparing resources</H1> |
| |
| <p>When a comparison is performed, comparison |
| editors appear in the editor area. The differences between files are highlighted |
| in the comparison editors, allowing you to browse and copy changes between the compared |
| resources. |
| </p> |
| |
| <p>To compare resources: |
| </p> |
| |
| <ol> |
| <li>Select one or more resources in the Navigator view.</li> |
| <li>From the resource's pop-up menu, select <b>Compare With.</b></li> |
| </ol> |
| |
| <p>A tool for viewing differences is opened in the editor area. |
| </p> |
| |
| <p>Here are some of the comparisons that you can perform. |
| </p> |
| |
| <dl> |
| <dt><b>Compare With > Latest from Repository</b></dt> |
| <dd>compares the selected resource with the version of the same resource that is |
| currently committed to the active branch.</dd> |
| <dt><b>Compare With > Branch or Version</b></dt> |
| <dd>compares the selected resource with a version that has been committed to the |
| repository or to the latest version in a particular branch. This requires |
| you to choose a version of the resource or a branch from a list.</dd> |
| <dt><b>Compare With > Patch</b></dt> |
| <dd>Displays the result of applying a patch to a resource.</dd> |
| <dt><b>Compare With > Each Other</b></dt> |
| <dd>compares two or three selected resources with each other</dd> |
| <dt><b>Compare With > Revision</b></dt> |
| <dd>compares the selected resource with a version of the same resource that was |
| committed to the active branch. This requires you to choose a revision of the |
| resource from a list.</dd> |
| <dt><b>Compare With > Local History</b></dt> |
| <dd>compares the selected resource to one that is in the local history, which |
| is maintained when you save changes. (<em>Tip:</em> to configure the size |
| and depth of your local history, look under <b>Window > Preferences |
| > Workbench > Local History</b>.)</dd> |
| </dl> |
| |
| <p><em>Tip:</em> You can customize the behavior of the comparison editor by |
| selecting <b>Window > Preferences > Workbench > Compare/Patch</b> |
| from the main menu bar. You can select to "lock scroll" the pane |
| contents, as well as setting options for showing conflicts with other team |
| members and changing the default font.</p> |
| |
| |
| <p><img border="0" src="../images/ngrelc.gif" alt="Related concepts" width="159" height="27"><br> |
| <a href="../concepts/concepts-30.htm">Synchronizing with a CVS repository</a><br> |
| <a href="../concepts/concepts-29.htm">Three way comparisons</a><br> |
| <a href="../concepts/concepts-17a.htm">Local history</a></p> |
| |
| <p><img border="0" src="../images/ngrelt.gif" alt="Related tasks" width="159" height="27"><br> |
| <a href="tasks-115.htm">Synchronizing with the repository</a><br> |
| <a href="tasks-68dg.htm">Merging changes in the Compare editor</a><br> |
| <a href="tasks-113b.htm">Resolving conflicts</a><br> |
| <a href="tasks-68b.htm">Setting preferences for comparing files</a><br> |
| <a href="tasks-101.htm">Comparing resources with repository versions</a><br> |
| <a href="tasks-68bg.htm">Understanding the comparison</a><br> |
| <a href="tasks-68c.htm">Working with patches</a><br> |
| <a href="tasks-3g.htm">Tiling editors</a></p> |
| |
| <p><img border="0" src="../images/ngrelr.gif" alt="Related references" width="159" height="27"> |
| <br><a href="../reference/ref-25.htm">Compare editor</a> |
| <br><a href="../reference/ref-33.htm">CVS Synchronize view</a> |
| </p> |
| |
| <p> <br> |
| <a href="../hglegal2003.htm"><img src = "../images/ngibmcpy2003.gif" alt="Copyright IBM Corporation and others 2000, 2003" border="0" width="324" height="14"></a> |
| </p> |
| |
| </BODY> |
| </HTML> |
