Right-click the solution or project you want to synchronize, and select Sychronize Solution or Synchronize Project. Or, select File | Source Control | Sychronize.
Continue reading or, for more detailed information on the Synchronization Tool, see the Serena Dimensions CM User’s Guide.
If the Folder field is not set to the work area folder that you require, enter the path or use the browse button to select it. This folder can be a subfolder of the project.
Synchronize with: Specify a Dimensions CM project or click the browse button to select one.
Select the kind of synchronization you want to perform:
-
Under Include the following types of local changes choose which type of changes from your local working location you will upload to the repository. Select/deselect the types of change that you want to upload: Additions, Deletions, Modifications, Moves/Renames.
-
Under Include the following types of repository changes choose which type of changes from the repository you will download to your local working area. Select/deselect the types of change that you want to download: Additions, Deletions, Modifications, Moves/Renames.
Under Filter using wildcards (optional), enter expressions to include and exclude files and folders when synchronizing. The inclusions, if entered, will be evaluated before the exclusions when the synchronization is performed.
-
In the Include local folders field, enter an expression to specify files or folders in the working location that you want to include in the synchronization.
-
In the Exclude local files field, enter an expression to specify files or folders in the working location that you want to exclude from the synchronization.
For example:
\.obj$
Excludes paths that end with the string ".obj"
Excludes "hello.obj" but not "hello.c"
^src\\debug
Excludes paths that start with the string "src\debug"
Excludes "src\debug\hello.obj" but not "src\hello.obj"
^New.*\.txt$
Excludes paths that start with "New" and end with ".txt"
Excludes "New Document.txt" but not "New Document.wav"
-
In the Include repository folders field, enter an expression to specify files or folders in the repository that you want to include in the synchronization.
-
In the Exclude repository files field, enter an expression to specify files or folders in the repository that you want to exclude from the synchronization.
Click Show additional options to display options on change detection and login.
If required, change the Change detection options. 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.
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.
Click the Next button. The next window displays the differences between your local work area and the repository.
Select a display mode:
-
Repository view
: To view only items in the repository. -
Work area view
: To view only files in the work area. -
Consolidated view
: To view items and files in both the repository and the work area. This is the default view.
Expand the folder tree as needed, or use the navigation buttons, to review the differences and conflicts:
-
Previous Difference: To ascend the file tree to the previous difference.
-
Next Difference: To descend the file tree to the next difference.
-
Previous Conflict: To ascend the file tree to the previous conflict.
-
Next Conflict: To descend the file tree to the next conflict.
To compare a work area file and a repository item, select a file/item and click the Compare button. The file Merge tool opens.
To specify a resolution for a difference or a conflict, select the file and then click a resolution on the toolbar. The resolution proposed by the wizard appears in bold text; available resolutions are underlined.
If you do not select a specific resolution, the proposed resolution will be implemented upon completion of the wizard. Some or all of the following resolutions are available:
-
Accept: Accept the changes from either the local work area or the repository.
-
Ignore: Leave both the work area file and the repository item as they are.
-
Use local: Add the work area file to the repository as the latest item version.
-
Use repository: Overwrite the work area file with the latest item version from the repository.
-
Merge: Launch the file Merge tool to resolve the internal differences between the work area file and the repository item.
If necessary, change any of the following default options on the Defaults tab. These settings apply to all applicable files included in the synchronization unless overridden for specific files:
-
Comment for check-in: Description of any changes you are checking in.
-
Relate to request: A request ID to relate to the changes you are checking in.
-
Permissions after Update: Choose whether to make files that are updated on your local system writable or left as they currently are.
-
Design part for new files: Browse to choose a design part for any new files you are uploading.
-
Permissions after Deliver: Choose whether to make files that you are checking in or adding to Dimensions read-only, or left as they currently are.
-
Apply date / time of: Choose Repository item if you want the date/time of the files downloaded to the working location to have the same value as the item in the repository. Choose Current system if you want downloaded files to have the current date and time.
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.
Click Next to display a synchronization summary, then start the synchronization.