Updating Your Local Work Area with Changes from Dimensions CM

Complete these steps to download changes from the stream in Dimensions to your local work area. This includes files that other users have modified, added, moved, and renamed. You must also update your work area before proceeding with a delivery of local changes if there are conflicts between your local files and files in the Dimensions repository.

To update your work area with changes from Dimensions:

  1. Select the project in the Solution Explorer.

  2. Click the Update button, or select File | Source Control | Update. The Update wizard appears.

  3. Complete the following on the first page of the Update wizard:

    Field

    Description

    Include the following types of changes

    Choose the types of changes to download, including additions, deletions, modifications, and moves and renames.

    Filter using wildcards (optional)

    Enter expressions to include and exclude files and folders. For example, entering

    \.obj$

    in the Exclude repository files field excludes paths that end with the string ".obj"

    Show additional options

    Click to enter additional options on change detection and logging.

    Specify change detection method

    If you want Dimensions CM to only use the timestamp to detect whether files in the working location have changed, select Use modification time (fastest). If you want Dimensions CM to use the file checksum to detect whether files have changed, select Checksum file content.

    Logging

    If you require an output log for the results of the synchronization, select Enable in folder under Logging and enter a path or click the Browse button.

  4. Click the Next button. The next window displays the differences between your local work area and the repository.

  5. If necessary, change any of the following default options on the Defaults tab. These settings apply to all applicable files included in the update unless overridden for specific files:

  6. To set any of the above options to a unique value for specific files, select a file and click the Options tab. Here, you can override the setting with unique values.

  7. Scan the differences for any files that are in conflict. These are identified by the word Conflict in the Change Type column. A description of the conflict is displayed on the Details tab. Click the appropriate button on the toolbar to select the resolution, or if you want to merge the content of the two files that are in conflict do the following:

    1. Click the Merge button to launch the Serena Merge Tool to compare the contents. You can configure other merge tools to be used for this as well (see the Serena Administrator’s Guide for more information).

    2. Use the Merge tool to resolve the conflicts. See the Merge tool online help for more information. The file resolution is now shown as Merge.

  8. Repeat these steps for each file that is in conflict.

  9. Click Next and complete the update.

See the Dimensions User’s Guide for detailed information on using and merging development streams.