| <!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>Synchronize view</title> |
| |
| </head> |
| <body style="background-color: rgb(255,255,255);"> |
| <h1>Synchronize view</h1> |
| <p class="Para"> This view allows you to update resources in the Workbench |
| and commit resources from the Workbench to a repository. </p> |
| |
| <p class="Para"> Here is what the Synchronize view looks like:</p> |
| |
| <p class="Para"> <img align="top" border="0" |
| src="../images/Image245_sync_view.gif" alt="Synchronization View"> |
| </p> |
| |
| <div class="XRefList"> |
| <h2 class="Para">Modes</h2> |
| |
| <p> There are three different viewing modes (filters) that you can use in |
| this view to make the synchronization process easier:</p> |
| |
| <dl> |
| <dt>Incoming</dt> |
| <dd>In this mode, only resources which have been changed in the repository |
| since they were last loaded or synchronized with those in the Workbench |
| (incoming changes) are visible. If you have incoming changes when you |
| synchronize, you will start off in this mode.</dd> |
| <dt>Outgoing</dt> |
| <dd> In this mode, only resources which have been modified in the Workbench |
| (outgoing changes) are visible. If you do not have incoming changes |
| when you synchronize, you will start in this mode.</dd> |
| <dt>Incoming/Outgoing</dt> |
| <dd> In this mode both incoming and outgoing changes are shown, and you can |
| both update and commit. You will remain in this mode with future synchronizations |
| until you close the view. The advantage to using this dual mode is |
| you can do either task as you choose. The disadvantage is that performing |
| a simultaneous bi-directional merge is often complicated. In addition, you |
| risk accidentally committing a conflict when you meant to update to it. |
| You can choose to always use Incoming/Outgoing mode on the Workbench preferences |
| page (<b>Window> Preferences > Team</b>).</dd> |
| </dl> |
| |
| <p class="Para">Modes not only filter the set of visible changes but also |
| restrict the set of operations available. |
| You can switch modes using the toolbar of the Synchronization |
| view.</p> |
| |
| <P>The advantages to modes are: </P> |
| <ul> |
| <li> |
| They support and encourage the <a href="../concepts/concepts-26.htm#IdealWorkFlow"> ideal work flow.</a></li> |
| <li> |
| They reduce the amount of information you are faced with at any one time.</li> |
| <li> They provide a degree of safety restricting you to those operations appropriate |
| to that mode. For example, you can't accidentally commit a conflict when |
| in incoming mode.</li> |
| </ul> |
| |
| <p class="Para">Regardless of the mode that you select, you will always see |
| any conflicts that exist. You can filter out other outgoing and incoming |
| changes by clicking the <b> Show Only Conflicts</b> button. You |
| can also choose to Compare File Contents (and show only those resources |
| whose contents differ), Ignore Whitespace differences or Refresh From |
| Repository from the drop-down menu of this view.</p> |
| |
| <p class="Para"> <b>Important</b>: It is preferable to update resources in the |
| Workbench first, resolve any conflicts that exist by merging, then commit |
| Workbench resources to the repository.</p> |
| <h2 class="Para">Synchronization state</h2> |
| <p class="Para">The top left pane in the synchronize view shows the synchronization |
| state of resources in your workspace compared to those in the repository. |
| This state is shown by using icons and can also be configured to show the |
| state as text appended to the resource name. A description of the icons is |
| shown in the table below:</p> |
| <table width="100%" border="1"> |
| <tr> |
| <td width="9%" align="center"><img src="../images/r_inadd_ov.gif" alt="Incoming addition icon" width="11" height="10"></td> |
| <td width="91%">An incoming addition means that a resource has been added |
| to the repository. <strong>Updating</strong> will transfer the resource |
| to your workspace.</td> |
| </tr> |
| <tr> |
| <td align="center"><img src="../images/r_inchg_ov.gif" alt="Incoming change icon" width="11" height="10"></td> |
| <td>An incoming change means that the file has changed in the repository. |
| <strong>Updating</strong> will transfer the new file revision to your |
| workspace.</td> |
| </tr> |
| <tr> |
| <td align="center"><img src="../images/r_indel_ov.gif" alt="Incoming deletion icon" width="11" height="10"></td> |
| <td>An incoming deletion means that a resource was deleted from the server. |
| <strong>Updating</strong> will delete your local resource.</td> |
| </tr> |
| <tr> |
| <td align="center"><img src="../images/r_outadd_ov.gif" alt="Outgoing addition icon" width="11" height="10"></td> |
| <td>An outgoing addition means that the file was added to your workspace |
| and is not yet in the repository. <strong>Adding</strong> then <strong>Committing</strong> |
| will transfer the new file to the repository.</td> |
| </tr> |
| <tr> |
| <td align="center"><img src="../images/r_outchg_ov.gif" alt="Outgoing change icon" width="11" height="10"></td> |
| <td>An outgoing change means that the file was change locally. <strong>Committing</strong> |
| the file will transfer the changes to the repository and create a new |
| revision of the file.</td> |
| </tr> |
| <tr> |
| <td align="center"><img src="../images/r_outdel_ov.gif" alt="Outgoing deletion icon" width="11" height="10"></td> |
| <td>An outgoing deletion is a resource that has been deleted locally. <strong>Committing |
| </strong>these resources will cause the remote resource to be deleted. |
| <strong>Note</strong>: in CVS directories are never really deleted from |
| the repository. Instead, files are deleted and empty directories are pruned |
| from your workspace. </td> |
| </tr> |
| <tr> |
| <td align="center"><img src="../images/confadd_ov.gif" alt="Conflicting addition icon" width="11" height="10"></td> |
| <td>A conflicting additions means that the resource has been added locally |
| and remotely.</td> |
| </tr> |
| <tr> |
| <td align="center"><img src="../images/confchg_ov.gif" alt="Conflicting change icon" width="11" height="10"></td> |
| <td>A conflicting change means that the file has been changed locally and |
| remotely. A manual or automatic merge will be required by the user.</td> |
| </tr> |
| <tr> |
| <td align="center"><img src="../images/confdel_ov.gif" alt="Conflicting deletion icon" width="11" height="10"></td> |
| <td>A conflicting deletion means that the resource was deleted locally and |
| remotely. </td> |
| </tr> |
| <tr> |
| <td align="center"><img src="../images/confauto_ov.gif" alt="Auto-mergeable conflict icon" width="11" height="9"></td> |
| <td>An auto-mergeable conflict is a conflict that can be automatically merged |
| by CVS. This is because the file was changed locally and remotely but |
| in different locations in the file. This indicator is important because |
| it can allow you to review the changes from within the synchronization |
| view and then perform a <strong>Override and Update</strong> that will |
| perform the merge automatically for you.</td> |
| </tr> |
| <tr> |
| <td align="center"><img src="../images/question_ov.gif" alt="Icon for resources not yet added to version control" width="7" height="8"></td> |
| <td>A non-added resource that has never been committed to the repository.</td> |
| </tr> |
| </table> |
| |
| </div> |
| <div class="Topic"> |
| <h2>Structure compare pane</h2> |
| |
| <p class="Para"> This pane allows you to view a hierarchy tree of all the |
| resource differences between the repository and the Workbench.</p> |
| </div> |
| |
| <h2> Text compare pane</h2> |
| |
| <p class="Para"> This pane allows you to view the content differences of the |
| resource selected in the structure compare pane. You can choose to ignore |
| whitespace differences from the view's drop-down menu.</p> |
| |
| <p><img border="0" src="../images/ngrelc.gif" alt="Related concepts" |
| width="159" height="27"> |
| <br> |
| <a href="../concepts/concepts-26.htm">Team programming with CVS</a><br> |
| <a href="../concepts/concepts-30.htm">Synchronizing with a CVS repository</a> |
| </p> |
| |
| <p><img border="0" src="../images/ngrelt.gif" alt="Related tasks" |
| width="159" height="27"> |
| <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><a href="../tasks/tasks-68.htm"><br> |
| </a> <a href="../tasks/tasks-68.htm">Comparing resources<br> |
| </a> <a href="../tasks/tasks-68dg.htm">Merging changes in the compare |
| editor</a></p> |
| |
| <p><img border="0" src="../images/ngrelr.gif" alt="Related reference" |
| width="159" height="27"> |
| <br><a href="../reference/ref-47.htm">CVS</a> |
| <br> |
| <a href="ref-25.htm">Compare editor</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> |
