Using the ComponentSoftware Administrator
Top  Previous  Next


Use the ComponentSoftware Administrator tool to manage branch status and merge operations. This section explains the ComponentSoftware Administrator features. The next section outlines the steps required to merge a branch into the trunk.

To open the ComponentSoftware Administrator:
1.Open the Document Explorer (refer to Using the Document Explorer Tool in CS-RCS Tools).  
2.From the Project menu, click Launch Administrator.  
The ComponentSoftware Administrator appears:  
 
 
 
 

The ComponentSoftware Administrator lists all files that are in the project and displays the following document properties:
·Document Name – The file's name.  
·Type – The file's extension.  
·Folder Name – The file's path.  
·Change – One of the following options is displayed:  
·None – The branch and the trunk have not been changed.  
·Branch – A new revision has been added to the branch.  
·Trunk – A new revision has been added to the trunk.  
·Both – A new revision has been added to both the branch and trunk.  
·Added – This file has been added to the branch.  
·Deleted – This file has been deleted from the branch.  
·Change time – The latest time either the branch or the trunk has been modified.  
·Merge Status – One of the following options is displayed:  
·N/A – No merge is needed.  
·Automatic – The merge can be done automatically by CS-RCS.  
·Conflicts – The merge can be done automatically by CS-RCS. However, you must review the result, as there are conflicts you must resolve manually.  
·Manual – A manual merge is needed. This is normal for binary files.  
·Revision Branch revision number.  
·Time – Branch check-in time.  
·Locked by – Branch user that locked this revision (if any).  
·Trunk Revision – Trunk revision number.  
·Trunk Time – Trunk check-in time.  
·Trunk Locked by – Trunk user that locked this revision (if any).  

For more details on the ComponentSoftware Administrator tool, refer to Using the ComponentSoftware Administrator Tool in CS-RCS Tools.)