While you are working on a project in the Workbench, other members of your team may be committing changes to the copy of the project in the repository. To get these changes, you may "update" your Workbench to match the state of the branch. The changes you will see will be specific to the branch that your Workbench project is configured to share. You control when you choose to update.
The update command can be issued from two places: the Team > Update menu, or the Synchronize view. In order to understand the difference between these two commands, it is important to know about the three different kinds of incoming changes.
When you select Team > Update, the contents of the local resources will be updated with incoming changes of all of the above three types. You can specify what the update behaviour should be in the Team > CVS > Update/Merge preference page. The choices are:
It is often desirable to know what incoming changes there are before updating any local resources. These issues are addressed by the Synchronize view.
To open the Synchronize view in incoming mode:
In incoming mode, you will see changes that have been committed to the branch since you last updated. The view will indicate the type of each incoming change. There are two update commands (available from the context menu of any resource in the view) to deal with the different types of conflicts: Update and Override and Update. When you select the Update command in the Synchronize view, all selected incoming and auto-mergeable conflicting changes are processed while conflicts that are not auto-mergeable will not be updated (any files that have been successfully processed are removed from the view). The Override and Update command operates on conflicts and will replace the local resources with the remote contents. This "replace" behavior is rarely what is desired. An alternative is described later.
To update non-conflicting and auto-mergeable files:
If your local Workbench contains any outgoing changes that are not auto-mergeable with incoming changes from the branch, then, instead of performing an Override and Update, you can merge the differences into your Workbench manually, as follows:
Note: The repository contents are not changed when you update. When you accept incoming changes, these changes are applied to your Workbench. The repository is only changed when you commit your outgoing changes.
Tip: In the Synchronize view, selecting an ancestor of a set of incoming changes will perform the operation on all the appropriate children. For instance, selecting the top-most folder and choosing Update will process all incoming and auto-mergeable conflicting changes and leave all other incoming changes unprocessed.
Warning: The behavior of the Override and Update command described above only applies to the incoming mode of the Synchronize view. In the Incoming/Outgoing mode of the view, the behavior for incoming changes and conflicts is the same but the command will revert outgoing changes to whatever the repository contents are. Exercise great caution if using this command in Incoming/Outgoing mode.
Team programming with CVS
Synchronizing with a CVS repository
Version control life cycle: adding and ignoring resources