Updating a Work Area from a Stream and Resolving Conflicts

You can update your work area with the latest changes from any version of a stream that is associated with a work area. If there are conflicts you can resolve them by:

If a conflict includes path differences these resolutions are also available:

In the Update wizard use the file merge tool to manually merge the content of the files unless they are merged automatically.

To set your current stream and work area in the desktop client:

  1. Do one of the following:

  2. Do one of the following:

  3. Select a work area to be associated with the stream or use the browse button to select one.

  4. To make this your default stream select Make the selected stream and work area my default

  5. Click Open.

To update a work area from a stream and resolve conflicts:

  1. Do one of the following:

  2. The Update Work Area from Stream wizard opens.

  3. The Update changes from this stream box displays the name of the stream from which you invoked the update. To change the stream click Select and select one of the options in the Select Stream dialog box. If you select Another stream do one of the following:

  4. Optionally select a version of this stream on which to base the new stream.

    PRODUCT:STREAM_NAME;VERSION

    For example: QLARIUS:JAVA_BRANCHA;5

    NOTE  If you do not specify a stream version the tip is used.

    Click OK.

  5. The Update this work area box displays the work area path that will be updated. To change the work area enter its path or click Select and choose an area.

  6. To interactively (manually) verify the results of any file merge operation before applying them to the work area, select Perform an interactive update.

  7. To restrict the update to a specific folder and its subfolders, select Limit the scope of the merge to this folder and browse to the folder, or enter its repository path. If you invoked the update operation from a subfolder, and not the root of the stream, its path is pre-populated.

  8. Click Advanced.

  9. To restrict the update to particular files or folders, enter wildcard filters in:

  10. For details about using these filters see Using Wildcards to Include and Exclude Files and Folders.

  11. To apply the repository date and time to the updated files in the work area select Apply repository date and time.

  12. (Used when shelving a stream) To create a clean work and reset the work area to the latest repository content, select Reset work area changes to repository versions and paths. You can also choose to delete locally added files (such as artifacts added by a local build process).

  13. Select Expand substitution variables if required.

  14. To automatically merge local and repository files whose content does not conflict, select Auto merge non-conflicting file content. You can also select a default character set that is used to transcode Unicode files before merging.

  15. Do one of the following:

  16. On the Review Changes page expand the folder tree to display the changes that have been identified.

  17. On the toolbar select a resolution for each conflict.

  18. If a conflict includes path differences these resolutions are also available:

    Your selection is displayed in the Resolution column.

    CAUTION!  If you select Use local or Use Repository you may discard a change that you want to keep.

    To merge the content of two file revisions that are in conflict click Merge. The default merge tool opens and displays the content of the revisions. After you have completed the merge successfully and exited the merge tool, the resolution is shown as Merge.

  19. Click Update. The results of the update operation are displayed.

  20. Click Close.

Related Topics

Synchronize Wizard