7.4 Derived Development of Sysmac Studio Projects This section describes the operating procedure to promote derived development of Sysmac Studio projects on an example. This example uses a configuration in which the remote repository is shared using the shared folder. 7.4.1 An example of derived development In this example, Machine B is developed and derived from Machine A. While the Machine B is being developed, defects were found and corrected in the common program of Machine A and Machine B. The correction is applied to the project of Machine B to complete the development.
7.4.1.1 About the Project It is assumed that, based on the project of Machine A, one developer develops a project of derivative Machine B. ProjectA: the project of Machine A. On the base of this project, the project of the derived Machine B is developed. ProjectB: the project of Machine B derived from Machine A project. It has different configurations and setup. This project utilizes the same program as that of ProjectA. 7.4.1.2 Scenario Create and manage branches master, ProductA, and ProductB; master is for common program management, ProductA is for Machine A, and ProductB is for Machine B.
The common program is modified in the master and the changes are applied to the ProductA and ProductB . 1. In the development of Machine A, create a new project ProjectA and incorporate it into the Machine A as Ver.1.0. Register this ProjectA to the master as the master project of derivation development. 2. In the development of Machine B, create ProjectB on the base of ProjectA Ver.1.0 and change the settings in Configurations and Setup. 3. Defects are found in the program of Machine A and the program is modified to fix them. Modify the program in the master project and apply the corrections to the Machine A as Ver.1.1. 4.
In the same way, apply the corrections to the ProjectB which is being developed and incorporate it to the Machine B as its Ver.1.0. 7.4.2 Operation flow on the version control system 98 Sysmac Studio Project Version Control Function Startup Guide (P125) No. Machine A development Machine B development Correction of Reference for the tasks defects 1 Register a project in the remote repository - - 7.4.3.1 Register a project in the remote repository (No.1: Machine A development) 2 Create a branch for Machine A in the local repository and push it to the remote repository * The project of Machine A is developed in this branch.
- - 7.4.3.2 Create a branch for Machine A in the local repository and push it to the remote repository (No.2: Machine A development) 3 Create the program of Machine A, commit it, and push it to the remoter repository * The tag as Ver.1.0 is applied to this project and the project is incorporated in the Machine A. - - 7.4.3.3 Create the program of Machine A, commit it, and push it to the remoter repository (No.3: Machine A development) 4 Merge the changes in the - - 7.4.3.4 Merge the changes in