Chapter 10 Comparing and Merging Models

Filtering the changes to merge

You can filter the objects that are shown in the merge window.

To define a merge filter:

1. In the Merge Models window, click the arrow next to the Change Filter tool to display the list of filters.
2. Select a filter from the list. You can filter by:
   
   
   • All objects
   • All changes
   • Only created objects
   • Only deleted objects
   • Only modified objects
   • Only moved objects
   • Only identical objects
   • Only selected objects
   • Show only conflicts - displays conflicts between models with common origin such as local model and consolidated model or origin model and generated model. A merge conflict occurs when corresponding objects have been modified in both the origin and generated model or the local and Repository model. Such modifications can be a change in object properties, a change in a list of objects, a change in the order of a list or the deletion of an object.
   • Hide all preservations - hides all differences associated with changes made in the model to be merged as well as all identical objects in order to show only changes made in the model on the left since last generation.
   • Advanced Filters – opens the Comparison Filters dialog box, which allows you to combine several filters, and also to filter on "object state":
     
     
     
     • Show only selected objects - Displays only selected merge actions
     • Show only conflictual objects - Displays objects that have been changed simultaneously by two different users. This filter is only available for merge during consolidation
     • Show only non-preserved objects - Displays objects modified in a generated model but not in the source model. This filter is only available for merge during model generation
   • You can display all created and deleted objects in the same tree view, check which objects have changed parent after a move (from one package to another package, for example), or which objects have been moved within the same collection (when you move attributes within the same entity, for example).
     
     Once you have selected all the appropriate criteria, click OK.
   
   
   The filter is applied to the Merge Models window, and only objects complying with the filter criteria are displayed.

Copyright (C) 2008. Sybase Inc. All rights reserved.