Updating a Work Area from a Stream

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:

- Choosing the item revision in the work area (Use Local).

- Choosing the item revision in the repository (Use Repository).

- Allowing Dimensions to attempt to automatically merge the contents provided there are no conflicts.

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

- Use local path

- Use repository path

1. Select the project in Solution Explorer.

2. On the toolbar click Update or select File | Source Control | Update. The Update Work Area from Stream wizard appears.

3. The Update changes from this stream box displays the name of the stream from which you invoked the update. To change the stream, do one of the following:

nClick Select and use the Select Stream dialog box to specify a stream and optionally a stream version.

nEnter the name of a stream, and optionally a version, in this format:

PRODUCT:STREAM_NAME;VERSION

For example:

QLARIUS:JAVA_BRANCHA_STR;5

4. 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.

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

6. 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 prepopulated.

7. For advanced options, click Advanced.

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

- The Include repository file box to only include specific file types.

- The Exclude repository file box to exclude specific file types.

For details, see Using Wildcards to Include and Exclude Files and Folders.

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

10. (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).

11. Select Expand substitution variables if required.

12. 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.

13. Do one of the following:

- If you are performing an interactive update click Next and go to the next step.

- If you are not performing an interactive update click Update. The work area is updated and the results are displayed.

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

15. On the toolbar, select a resolution for each conflict.

- To ignore a change click Ignore.

- To use the version of the change in the work area click Use Local.

- To use the version of the change in the repository click Use Repository.

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

- Use local path

- Use repository path

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, displaying the content of the revisions. After you have completed the merge successfully and exited the merge tool, the resolution is displayed as Merge.

16. To view the changes that have been made to a revision, right-click and select View.

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

18. Click Close.