Synchronizing with the repository (step 3a - cvsuser1)
User cvsuser1 now synchronizes with the repository and receives the changes of cvsuser2 (adding the View1 bean) and provides the opportunity to check-in the changes made to ServletA. Do these steps:
| In the Enterprise Explorer, right-click the RAD75CVSGuide project and select Team Æ Synchronize with Repository. |
|
| Select Remember my decision and click Yes to switch to the Synchronize view. |
|
| Expand the RAD75CVSGuide Æ src trees to view the changes (Figure | 8-22). |
Figure 28-22 User cvsuser1 merging with CVS repository
|
Note: The symbol |
in the diagram indicates that an existing resource differs from what is in the repository. The symbol 
indicates that a new resource is in the repository that does not exist on the local workspace.
|
| To obtain updated resources from the CVS repository, right-click the RAD75CVSGuide project and select Update. This brings a copy of the View1.java file into this workspace. |
|
Note: When using Application Developer v7.5, sometimes a Java file that has been changed appears twice in the Synchronize view. It might appear under the representation of the Java package and also under a folder representation of the packages. Figure | 8-22 shows an example of this with both View1.java and ServletA.java showing twice. While this looks untidy, if either of the representations of the file are updated, then both disappear from the Synchronize view as expected. |
|
| Verify that the changes do not cause problems with existing resources in the local workspace, by checking the Problems View. In this case, there are none. Right-click the RAD75CVSGuide project and select Commit. |
|
| In the Commit dialog, add the comment Static variable totalCount added to ServletA and click Finish (Figure | 8-23). This checks the changes made to ServletA into the repository. |
Figure 28-23 Adding comment for changes to ServletA
The repository now has the latest changes to the code from both developers. The user cvsuser1 is in sync with the repository; however, cvsuser2 has not yet received the changes to the ServletA.
|
ibm.com/redbooks |