CVS Common Problems

From WebRatio WebML Wiki

This article discuss the common problems you may face comparing Web projects. For each problem there is a brief description, a guideline showing how to correctly import changes, and what happen if you do not follow the guideline.

Undo Local Changes

Suppose you have committed a Web project in which there is a single page with two units, and index unit and a data unit. The two units are connected through a normal link. After that you made changes in the local version of the Web project, deleting the data unit. Here is a figure showing the Local and the Remote Web model.

Making the comparison, this is what the WebRatio Compare Editor shows you

There are only outgoing changes because nobody committed another version of the Web project.

What you want to do is to re-import the unit you deleted. These are the steps to correctly perform this operation:

1. import the data unit
2. import the normal link
3. import the grid

Remember that in order to import an element from the Remote Web project you have to select it from the tree and choose the Override and Update command in the context menu. To get the tree reloaded you have to save changes.

The reason of these steps is that the normal link and the grid elements have references to the data unit. The normal link has the data unit as its target, while the grid contains the layout unit related to the data unit. You can also import elements in any other order, but in this case the imported change is not deleted from the tree when you save the file. What you see is the same element that you imported shown as conflictual change. This is due to the references that elements have to each other and to the fact that you have not imported the referenced element yet. When you import the data unit, which is the referenced element in this case, you will see all the conflictual changes disappear. Since there is no way to change this strange behaviour, it's better to follow the previous guidelines.

Import New Objects

Suppose a team member committed a Web project in which there is a new entity in the data model. There are also units that have the new entity as their master entity. You do not have these information in your local project because you have a previous version. Here is a figure showing the Local and the Remote Web model.

Making the comparison, this is what the WebRatio Compare Editor shows you

What you want to do is to import the objects. These are the steps to correctly perform this operation:

1. import the entity from the data model
2. import the the units based on the new entity from the Web model
3. import the grid

The reason of these steps is that the unit in the Web model and the grid elements have references to the entity in the data model. The unit has the entity as its master entity, while the grid contains the layout unit related to the unit. You can also import elements in any other order, but in this case the imported change is not deleted from the tree when you save the file. What you see is the same element that you imported shown as conflictual change. When you import the entity you will see the conflict on the unit disappear and when you import the unit you will see the conflict on the grid disappear. Also in this case, since there is no way to change this strange behaviour, it's better to follow the previous guidelines.

Related articles: Category Difficulty Refers Adding the Start Tomcat plugin Customizing the Environment Beginner WebRatio CVS Common Problems Team Work Intermediate WebRatio CVS Compare Overview Team Work Intermediate WebRatio Can I download new plugins for Eclipse from WebRatio?How? Customizing the Environment Beginner WebRatio How can I increase memory in WebRatio? Customizing the Environment Beginner WebRatio … further results