| <!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=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"> |
| <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" type="text/javascript"></script> |
| <title>CVS Update/Merge</title> |
| |
| </HEAD> |
| <BODY BGCOLOR="#ffffff"> |
| <H1 CLASS="Head">CVS Update/Merge</H1> |
| <P CLASS="Para"> The |
| |
| <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=org.eclipse.team.cvs.ui.UpdateMergePreferences)")'> |
| <img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="command link"> |
| <strong>Team > CVS > Update/Merge</strong></a> |
| |
| preferences page contains options which |
| affect the update/merge workflows.</P> |
| <TABLE BORDER="1" cellspacing="0"> |
| <THEAD> |
| <TR> |
| <TH ROWSPAN="1" COLSPAN="1">Option</TH> |
| <TH ROWSPAN="1" COLSPAN="1">Description</TH> |
| <TH ROWSPAN="1" COLSPAN="1">Default</TH> |
| </TR> |
| </THEAD> |
| <TBODY> |
| <TR> |
| <TD COLSPAN="1" valign="top" align="left">When performing an update</TD> |
| <TD COLSPAN="1" valign="top" align="left">Use this option to select what the workflow |
| should be for performing an update. The options are: |
| <ul> |
| <li><strong>Preview all incoming changes before updating</strong>: |
| <br>All incoming changes are displayed in either the synchronize view or a dialog. You must explicitly |
| select which resources to update and deal with conflicts.</li> |
| |
| <li><strong>Update all non-conflicting changes and preview remaining updates</strong>: |
| <br>All non-conflicting resources are updated automatically and a list of conflicts (if applicable) are presented to you in |
| either the synchronize view or a dialog.</li> |
| |
| <li><strong>Never preview and use CVS text markup to indicate conflicts</strong>: |
| <br>All non-conflicting resources are updated automatically and conflicts are dealt with by adding the conflicting code to the file |
| and using CVS text markup to delineate the boundaries of the conflict. You must then go through each file that had a conflict, look |
| for the markup, and manually merge the contents.</li> |
| </ul> |
| </TD> |
| <TD COLSPAN="1" valign="top" align="left">Never preview and use CVS text markup to indicate conflicts</TD> |
| </TR> |
| <TR> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> |
| When an update preview is required</TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> Use |
| this option to configure how to preview incoming changes. Changes can be previewed in |
| a dialog or in the Synchronize view. |
| </TD> |
| <TD ROWSPAN="1" COLSPAN="1" valign="top" align="left"> |
| Preview updates in the Synchronize view.</TD> |
| </TR> |
| </TBODY> |
| </TABLE> |
| <P>Here is what the CVS Update/Merge preference page looks like: </P> |
| <img src="../images/cvs-updatemerge.png" alt="Team Preference Page" border="0"> |
| <p><img border="0" src="../images/ngrelr.png" alt="Related reference"> <br> |
| <a href="ref-33.htm">CVS Synchronize view</a> </p> |
| |
| |
| |
| |
| </BODY> |
| </HTML> |
