Updating

The Synchronize view will be used to update the local resource to the latest contents in the repository and to commit any changes.

 

  1. Confirm that the Synchronize view is in Incoming Mode (#1). If it is not then press the Incoming Mode button on the local toolbar (#2).

    Incoming mode

  2. Open file1.txt (the incoming change) by double-clicking. The comparison viewer shows that the repository copy of file1.txt has a new line inserted (Fred-update).

    Text Compare

  3. From the context menu of file1.txt choose Update. This will cause the Workbench to be updated with the repository copy of file1.txt.

  4. Select file2.txt. The comparison viewer shows that the repository copy of file1.txt and the local copy of file1.txt have both had the exact same line modified. 

    Text Compare

  5. If the change seems suspicious, find out some more information about it. To do this, first figure out who made the change and why.

    In the Structure compare pane of the Synchronize view select file2.txt and choose Show in Resource History from the context menu.

    Resource History

  6. In the Resource History view (see above) there is a * next to version 1.1. This indicates 1.1 is currently in the Workbench. It also shows that the repository contains 1.2 of file2.txt. The author of 1.2 is Fred. Looks like it's time to ask Fred why he was changing file2.txt. 

    If Fred had entered a meaningful description when releasing his changes, these descriptions would have appeared in the comment field of the Resource History view thereby providing some insight into the intent of the change.

  7. The four copy buttons can now be used to help merge in conflicting changes made to the repository.

    For now assume that Fred's change turns out to be the right one.

    Select file2.txt and choose Override and Update from the context menu. When asked to confirm the replacement choose Yes.

  8. The Update mode no longer has any remaining incoming or conflicting changes. 

    The status bar shows that there is still one remaining outgoing change to deal with.

    Status bar