Sysmac Studio Startup Guide for Project Version Control Function

Sysmac Studio Startup Guide for Project Version Control Function

Trademarks • Sysmac and SYSMAC are trademarks or registered trademarks of OMRON Corporation in Japan and other countries for OMRON factory automation products. • Microsoft, Windows, Excel, and Visual Basic are either registered trademarks or trademarks of Microsoft Corpora- tion in the United States and other countries. • EtherCAT ® is registered trademark and patented technology, licensed by Beckhoff Automation GmbH, Germany. • ODVA, CIP, CompoNet, DeviceNet, and EtherNet/IP are trademarks of ODVA. • The SD and SDHC logos are trademarks of SD-3C, LLC.

• NVIDIA, the NVIDIA logo, GeForce, and the GeForce logo are the trademarks or registered trademarks of NVIDIA Corporation in the USA and other countries. • ATI TM , Radeon TM is a trademark of Advanced Micro Devices, Inc.. • Celeron, Intel and Intel Core are trademarks of Intel Corporation in the U.S. and / or other countries. • Git and the Git logo are either registered trademarks or trademarks of Software Freedom Conservancy, Inc., corporate home of the Git Project, in the United States and/or other countries. Other company names and product names in this document are the trademarks or registered trademarks of their respective companies.

Copyrights Microsoft product screen shots reprinted with permission from Microsoft Corporation. NOTE All rights reserved. No part of this publication may be reproduced, stored in a retrieval system, or transmitted, in any form, or by any means, mechanical, electronic, photocopying, recording, or otherwise, without the prior written permission of OMRON. No patent liability is assumed with respect to the use of the information contained herein. Moreover, because OMRON is constantly striving to improve its high-quality products, the information contained in this manual is subject to change without notice. Every precaution has been taken in the preparation of this manual.

Neverthe- less, OMRON assumes no responsibility for errors or omissions. Neither is any liability assumed for damages resulting from the use of the information contained in this publication.

Page 2

Sysmac Studio Startup Guide for Project Version Control Function

Table of Contents INTRODUCTION ································································································ 3 Intended Audience ...................................................................................................... 3 Applicable Products ..................................................................................................... 3 Terms and Conditions Agreement .............................................................................. 3 Safety Precautions ......................................................................................................

4 Regulations and Standards ......................................................................................... 4 Software Licenses and Copyrights ................................................................. 4 Revision History ...........................................................................................................

4 1 OVERVIEW ····························································································· 5 2 TERMINOLOGY ······················································································· 6 3 SYSTEM CONFIGURATIONS ····································································· 7 3.1 Basic Configuration ........................................................................................ 7 3.2 Configurations to Share the Repository with Multiple Users .......................... 7 3.3 Basic operation of Version Control System ....................................................

10 4 SCOPE OF THE VERSION CONTROL ························································· 11 5 SOFTWARE SETUP AND BASIC SETTINGS ················································ 12 5.1 Installing the Sysmac Studio .......................................................................... 12 5.2 Registering Sysmac Studio Team Development Option ................................ 12 5.3 Installing Git .................................................................................................... 12 5.4 Installing “TortoiseGit” ....................................................................................

18 5.5 Initial Setting of “TortoiseGit” .......................................................................... 21 5.6 Creating the shared folder and remote repository ......................................... 23 5.7 Additional Setting for “TortoiseGit” ................................................................. 25 6 PROJECT RECORD CONTROL ON SYSMAC STUDIO ·································· 27 6.1 Overview of Project Record Control Using the Version Control Function ..... 27 6.2 Operation Example of Record Control Function ............................................

28 6.3 Preparing for Starting Project Control (Creating a Base Project and Saving It) ........................................................................................................................ 28 6.3.1 Creating a Base Project ..................................................................... 29 6.3.2 Registering the project in the Local Repository ................................. 30 6.3.3 Synchronizing the Local Repository and Remote Repository ........... 33 6.4 Updating the Project ....................................................................................... 37 Sysmac Studio Project Version Control Function Startup Guide (P125) 1

Page 3

Sysmac Studio Startup Guide for Project Version Control Function

6.4.1 Changing the Project Data ................................................................. 37 6.4.2 Registering Changes to the Local Repository (Commit) ................... 37 6.4.3 Registering the Changes to the Remote Repository (Push).............. 39 6.5 Searching for a Project ................................................................................... 41 6.5.1 Updating the Local Repository ........................................................... 41 6.5.2 Displaying Project Logs ...................................................................... 42 6.5.3 Searching for the Revision .................................................................

43 6.6 Comparing the Projects .................................................................................. 44 6.7 Reverting the Project ...................................................................................... 45 7 DEVELOPMENT BY MULTIPLE DEVELOPERS AND DERIVED DEVELOPMENT OF SYSMAC STUDIO PROJECT ········································································· 48 7.1 Utilization of version control function in development by multiple developers and derived development ...........................................................................................

48 7.2 Branch and Merge .......................................................................................... 50 7.3 Sysmac Studio Project Development by Multiple Developers ....................... 52 7.3.1 Sharing Edit Works to Concurrently Develop a Project by Multiple Developers ..................................................................................................... 52 7.3.2 Example of Dividing Tasks ................................................................. 53 7.3.3 Operating Procedure .......................................................................... 55 7.4 Derived Development of Sysmac Studio Projects .........................................

98 7.4.1 An example of derived development .................................................. 98 7.4.2 Operation flow on the version control system .................................... 98 7.4.3 Operating Procedure .......................................................................... 100 2 Sysmac Studio Project Version Control Function Startup Guide (P125)

Page 4

Terms and Conditions Agreement

INTRODUCTION Thank you for purchasing a Sysmac Studio Team Development Option. This manual contains operating procedure of basic functions of the Sysmac Studio Team Development Option and project version control function. Please read this manual and make sure you understand the operating procedure of the Sysmac Studio Team Development Option before you attempt to use it to build a control system. Intended Audience This manual is intended for the following personnel, who must also have knowledge of electrical systems (an electrical engineer or the equivalent). • Personnel in charge of introducing FA systems. • Personnel in charge of designing FA systems.

• Personnel in charge of installing and maintaining FA systems. • Personnel in charge of managing FA systems and facilities. For programming, this manual is intended for personnel who understand the programming language specifications in international standard IEC 61131-3 or Japanese standard JIS B 3503. Applicable Products This manual covers the following products. • Sysmac Studio Team Development Option Part of the specifications and restrictions for the CPU Units are given in other manuals. Refer to Sysmac Studio Version 1 Operation Manual (Cat.No.W504) and Sysmac Studio Project Version Control Function Operation Manual (Cat.No. W589) .

Terms and Conditions Agreement • WARRANTY • The warranty period for the Software is one year from the date of purchase, unless otherwise specifically agreed. • If the User discovers defect of the Software (substantial non-conformity with the manual), and return it to OMRON within the above warranty period, OMRON will replace the Software without charge by offering media or download from OMRON’s website. And if the User discovers defect of media which is attributable to OMRON and return it to OMRON within the above warranty period, OMRON will replace defective media without charge.

If OMRON is unable to replace defective media or correct the Software, the liability of OMRON and the User’s remedy shall be limited to the refund of the license fee paid to OMRON for the Software. • LIMITATION OF LIABILITY • THE ABOVE WARRANTY SHALL CONSTITUTE THE USER’S SOLE AND EXCLUSIVE REMEDIES AGAINST OMRON AND THERE ARE NO OTHER WARRANTIES, EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTY OF MERCHANTABILITY OR FITNESS FOR PARTICULAR PURPOSE. IN NO EVENT, OMRON WILL BE LIABLE FOR ANY LOST PROFITS OR OTHER INDIRECT, INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF USE OF THE SOFTWARE. Sysmac Studio Project Version Control Function Startup Guide (P125) 3

Page 5