Synchronizing Your Workspace with Dimensions CM Repository

The Synchronize with Repository command compares the local workspace to the repository and lists all incoming and outgoing changes, including updates, deletions, and conflicting changes. Conflicting changes are when both the local file and the repository file have been changed.

You can resolve the discrepancies by importing changes to your local workspace, merging the different files, or committing the changed files into source control.

To synchronize your workspace with source control:

  1. Select the projects that you want to synchronize with the Dimensions CM repository.

  2. Right-click and select Team | Synchronize with Repository.

  3. The Team Synchronizing perspective appears.

  4. Use the features in the Team Synchronizing view to evaluate the files that differ from source control, and choose whether to synchronize, check in, or merge the changed files.

  5. If you are using Dimensions streams and you have switched the mapping of your workspace project to a different stream from the one it was originally shared with or added from, the Synchronize view represents the content of a streams from the perspective of the contributor stream. It displays incoming changes from the contributor stream and performs checks to ensure that any files deleted in the home stream are not added back if they are still present in the contributor stream.     

    NOTE  If you are using the Wind River Workbench product, the Hierarchy of the Wind River projects will be used to determine the set of Eclipse projects to synchronize.

    About the Team Synchronize View in Eclipse

    The Team Synchronize view in Eclipse displays when you select Synchronize with Repository. The Synchronize view allows you to inspect the differences between the local Workbench resources and their remote counterparts, as well as update resources in the local Workbench or commit changes/resources from the local Workbench to the Dimensions CM repository.

    The Team Synchronize view has many features that help you to perform the synchronization with the repository, such as:

    Viewing Project Properties

    Serena Explorer allows you to access project attributes, history, relationships, and default working branch through a single dialog.


    To view source control information:

    The Properties dialog appears for the project.

    On this dialog, you can choose the Project Working Request or the Project Working Branch for the project:

    From the project properties page, you can also select the default library cache area. Selecting a library cache area for your project can increase the response time when contacting Dimensions CM. See the Serena Dimensions CM User's Guide for more information on library cache areas.

    Viewing the History of a Project

    The history of a project shows the previous actions on the project, such as the addition of files or the creation of baselines. The Project History is the history of a specific Dimensions CM project. It contains all file changes, similar to the Dimensions CM Desktop client. The history of an Eclipse Project is all the projects and baselines logically in the Eclipse project, such as derivations.

    To display the history of a project, in Serena Explorer, right-click the project node and choose Project History.

    The list of actions appear in the Project History tab.


    About Merging Streams

    Consider the following recommendations when working with Dimensions streams that you will merge:

    1. Switch the branch workspace project to the mainline stream.

    2. Synchronize to update the branch workspace with changes from the mainline stream.

    3. Test and validate the merge results, then switch the branch workspace project back to the branch stream.

    4. Deliver the changes to the branch stream.

    1. Switch the mainline workspace project to the branch stream.

    2. Synchronize to update the mainline workspace project with changes from the branch stream.   

    3. Test and validate the merge results, then switch the mainline workspace project back to the mainline stream.

    4. Deliver the changes to the mainline stream.

About Merging Projects

IMPORTANT!  Merging projects in Eclipse will use the Eclipse merge tool. The Eclipse merge tool does not support refactoring and is therefore not recommended for use with Dimensions projects. For best results, merge projects using the Project Merge tool within the Dimensions desktop client. Or, use Dimensions streams instead of projects.

The Project Merge option allows a selected local project to be merged with a project from the repository. The projects must be related by being derived from the same source, such as when the branch of a project is merged into the mainline of development.

The two projects are merged into your local workspace. The merge is performed using the compare and merge capability of Eclipse.

For the pedigree to contain merge transition, Mark as Merged has to be selected on a file or files which have already been merged and saved locally. When Mark as Merged is used, the merged files are removed from the merge view.

The merged files are committed to the Dimensions CM repository using the Synchronize with Repository command. The merge is recorded in Dimensions CM only when merge changes are committed to the repository.

Note that there is no lock held on the resources being merged, so other users can make changes to the repository.

To merge projects, right-click on the project to merge and select Team | Merge.