Chapter 7 Consolidating documents in the repository
During consolidation, if you choose to update the PowerDesigner model in the repository, you actually merge the local model with the repository model and the merge dialog box is used to display differences and select merge actions.
PowerDesigner does not support the merge of external application files, there are no conflicts for this type of documents.
When you update PowerDesigner models, the merge dialog box displays differences between models and lets you define merge actions. In the merge dialog box, the local model is the model displayed in the left pane, and the repository model is the model that will be modified in the right pane of the merge dialog box.
For more information about merging models, see section Comparing and Merging Models in the General Features Guide.
From the Merge dialog box you can use a filter to display only conflicts in both tree views. A conflict is a category of difference between models that occurs when the same object has been modified both in the local model and in the repository. Such can happen in the following situations:
| Conflict type | In the repository model |
In the local model |
|---|---|---|
| Creation | Object removed | Object modified |
| Deletion | Object modified | Object removed |
| Attribute difference | Object properties modified (Name, Code, change in order of a list, addition of an object...) | Object properties modified |
When you are consolidating a local model to the repository, a message appears in the Output window for each detected conflict in order to explain the conflict and the proposed resolution.
A final message lets you confirm the resolutions proposed by PowerDesigner, you can accept them or cancel the merge.
| Copyright (C) 2005. Sybase Inc. All rights reserved. |
| |