Updating a Work Area from Requests
You can update your local work area with items that are related to specific change requests. This allows you to limit the update to the changes that are associated with the requests. The operation is similar to updating a work area from a stream.
Select the requests that you want to update from, right-click, and select Update from Request. The Update Work Area from Request wizard opens.
The Update changes from this stream box displays the name of the stream from which you invoked the update.
The Update changes from the request(s) box displays the selected change requests. To add change requests, enter their IDs separated with a comma. To specify different change requests click Select and use the Request Selection wizard to specify a product and change requests.
NOTE The requests that you specify must contain changes delivered to the same stream.
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.
To interactively (manually) verify the results of any file merge operation before applying them to the work area, select Perform an interactive update.
To include item revisions related to child requests, select Also include items related to child requests.
For advanced options, click Advanced.
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 about using these filters, see Using Wildcards to Include and Exclude Files and Folders.
To apply the repository date and time to the updated files in the work area select Apply repository date and time.
Select Expand substitution variables if required.
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.
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.
On the Review Changes page expand the folder tree to display the changes that have been identified.
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.
Click Update. The results of the update operation are displayed.