| <!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>Synchronizing with a CVS repository</title> |
| |
| </head> |
| <body style="background-color: rgb(255,255,255);"> |
| |
| <h1 class="Head"> Synchronizing with a CVS repository</h1> |
| |
| <p class="Para"> In the CVS team programming environment, there are two |
| distinct processes involved in synchronizing resources: <i>updating</i> |
| with the latest changes from a branch and <i>committing</i> to the branch. </p> |
| |
| <p class="Para">When you make changes in the Workbench, the resources |
| are saved locally. Eventually you will want to commit your changes |
| to the branch so others can have access to them. Meanwhile, others |
| may have committed changes to the branch. You will want to update |
| your Workbench resources with their changes.</p> |
| |
| <p class="Para"><b>Important!</b>: It is preferable to update <i> before</i> |
| committing, in case there are conflicts with the resources in your Workbench |
| and the resources currently in the branch. </p> |
| |
| <p>The synchronize view contains filters to control whether you want to view only |
| <i>incoming changes</i> or <i>outgoing changes</i>. Incoming changes come from |
| the branch. If accepted, they will update the Workbench resource to the latest |
| version currently committed into the branch. Outgoing changes come from the |
| Workbench. If committed, they will change the branch resources to match those |
| currently present in the Workbench. </p> |
| |
| <p>Regardless of which mode (filter) you select, the Synchronize view always |
| shows you conflicts that arise when you have locally modified a resource |
| for which a more recent version is available in the branch. In this |
| situation you can choose to do one of three things: update the resource |
| from the branch, commit your version of the resource to the branch, or |
| merge your work with the changes in the branch resource. Typically |
| you will want to merge, as the other two options will result in loss of |
| work. </p> |
| |
| <p><img border="0" src="../images/ngrelc.png" alt="Related concepts" |
| > |
| <br> |
| <a href="concepts-26.htm">Team programming with CVS</a> |
| <a href="concepts-27b.htm"><br>Branches</a> |
| </p> |
| |
| <p><img border="0" src="../images/ngrelt.png" alt="Related tasks" |
| > |
| <a href="../tasks/tasks-115.htm"><br> |
| Synchronizing with the repository</a><a href="../tasks/tasks-113.htm"><br> |
| Updating</a><a href="../tasks/tasks-113b.htm"><br> |
| Resolving conflicts</a><a href="../tasks/tasks-100b.htm"><br> |
| Merging from a branch</a><a href="../tasks/tasks-114.htm"><br> |
| Committing</a> </p> |
| |
| <p><img border="0" src="../images/ngrelr.png" alt="Related references" > |
| <br><a href="../reference/ref-47.htm">CVS</a> |
| <br><a href="../reference/ref-33.htm">CVS Synchronize view</a> |
| </p> |
| |
| |
| |
| |
| </body> |
| </html> |
