| <!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"> |
| <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css"> |
| <title>Comparing resources</title> |
| <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> |
| </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 one of the navigation views.</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 > HEAD revision</b></dt> |
| <dd>compares the selected resource with the version of the same resource that is currently committed to the active |
| branch. This option is available for Git. This or a similar option, may or may not be available for other |
| repository types.</dd> |
| <dt><b>Compare With > Another 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. |
| This or a similar option, may or may not be available for other repository types.</dd> |
| <dt><b>Compare With > Each Other</b></dt> |
| <dd>compares two or three selected resources with each other</dd> |
| <dt><b>Compare With > History...</b></dt> |
| <dd>compares the selected resource with a version of the same resource that was committed to the active branch. |
| This action will open the History view in <em>compare mode</em>. You will then be able to choose which revision you |
| wish to compare by double clicking on a revision in the History view. This or a |
| similar option, may or may not be available for other repository types.</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, use the <a class="command-link" href= |
| 'javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.ui.preferencePages.FileStates)")'> |
| <img src="PLUGINS_ROOT/org.eclipse.help/command_link.svg" alt="command link"> <b>General > Workspace > Local |
| History</b></a> preference page.)</dd> |
| </dl> |
| <p><em>Tip:</em> You can customize the behavior of the comparison editor with 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"> <b>General > Compare/Patch</b></a> |
| preference page. You can select to "synchronize scrolling" of the pane contents, as well as setting options for |
| showing conflicts with other team members and changing the default font.</p> |
| <h3 class="related">Related concepts</h3> |
| <a href="../concepts/concepts-29.htm">Three way comparisons</a><br> |
| <a href="../concepts/concepts-17a.htm">Local history</a> |
| <h3 class="related">Related tasks</h3><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> |
| <h3 class="related">Related reference</h3><a href="../reference/ref-25.htm">Compare editor</a> |
| </body> |
| </html> |
