DOCSLIB.ORG

Collaborative Software Development

Total Page：16

File Type：pdf, Size：1020Kb

Download full-text PDF Read full-text
Collaborative Software Development Software development • Several users work on a same project – Remote or collocated users – Each one works on its own computer Groupware and Collaborative Interaction (asynchronous) Collaborative Software Development • Work on different tasks • Work at different times ! • Collaboration is hard to organize M2R Interaction - Université Paris-Sud - Année 2013-2014 Cédric Fleury ([email protected]) – Versioning, synchronization between users – Tasks distribution, social aspects Collaborative Software Development - M2R Interaction - Cédric Fleury !2 Outline Outline • Collaborative software development • Collaborative software development ! ! – Version control – Version control ! ! – Continuous integration – Continuous integration ! ! – Agile methods – Agile methods Collaborative Software Development - M2R Interaction - Cédric Fleury !3 Collaborative Software Development - M2R Interaction - Cédric Fleury !4 Version control Version control • Problematic • Problematic – We want to avoid this: – We want to avoid: • Manually share the files (USB key, email, Dropbox) • Delete or overwrite the files of other users • Broke all the project by making a mistake ! – We want to able to: • Edit the project at the same time • Keep an history of the modification • Keep the older version of the files + hierarchy [“Piled Higher and Deeper” by Jorge Cham: www.phdcomics.com] Collaborative Software Development - M2R Interaction - Cédric Fleury !5 Collaborative Software Development - M2R Interaction - Cédric Fleury !6 Version control Version control • Version control software • 2 kinds of architecture – Save & restore different versions of the files – Centralized – Synchronize users’ versions • CVS, SVN, … – Keep track of modifications and their authors – Decentralized (peer-to-peer): – Manage Branching and merging • GNU Arch, Mercurial, Bazaar, Git,… ! ! • Not only for software development – Decentralized can be used as a Hybrid – Report, images, data from experiments Architecture • One peer can be a central server Collaborative Software Development - M2R Interaction - Cédric Fleury !7 Collaborative Software Development - M2R Interaction - Cédric Fleury !8 Version control Version control • Centralized • Decentralized architecture architecture Collaborative Software Development - M2R Interaction - Cédric Fleury !9 Collaborative Software Development - M2R Interaction - Cédric Fleury !10 Version control Version control • Hybrid • Vocabulary (SVN) Centralized Architecture architecture – Architecture • Repository • Working copy – Actions • Checkout • Update • Commit • Revert • Diff, log, status Collaborative Software Development - M2R Interaction - Cédric Fleury !11 Collaborative Software Development - M2R Interaction - Cédric Fleury !12 Version control Version control • Vocabulary (Git) Hybrid Architecture • Drawbacks of the centralized architecture – Architecture • Remote and local repository – Just one access point to the data • Working copy – Just one communication point between users – Actions – Just one historic of the files • Clone – Versioning and sharing are the same operation • Pull, Push • Need to have a stable state before "committing" • Commit • Reset • Diff, log, status Collaborative Software Development - M2R Interaction - Cédric Fleury !13 Collaborative Software Development - M2R Interaction - Cédric Fleury !14 Version control Version control • Good practices • Users can modify the same file – But at different part/section of the files – Work on the local copy ! – Send the modification • If they modify the same part of a file • Check if the code compiles locally – A conflict appends • Check for updates from the other users • Usually, it cannot be resolve automatically – Manage conflicts if there are some • Users have to fix the conflit • Check if the code compiles with the updates – By telling to the system, which version is correct • Commit the code on the shared version (server) – By merging the modifications of the users Collaborative Software Development - M2R Interaction - Cédric Fleury !15 Collaborative Software Development - M2R Interaction - Cédric Fleury !16 Version control Version control • Conflicts management • Conflicts management 08/10/2010 11:44 AM 94 test.txt C:\workspace\test>svn up 08/10/2010 11:44 AM 26 test.txt.mine Conflict discovered in 'test.txt'. 08/10/2010 11:44 AM 27 test.txt.r2 Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved, 08/10/2010 11:44 AM 31 test.txt.r3 (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C test.txt test.txt Updated to revision 3. Summary of conflicts: <<<<<<< .mine Text conflicts: 1 test User2 making conflict ======= User1 am making a conflict test >>>>>>> .r3 Collaborative Software Development - M2R Interaction - Cédric Fleury !17 Collaborative Software Development - M2R Interaction - Cédric Fleury !18 Version control Version control • Tools for conflict management (TortoiseMerge) • Tools for conflict management (TortoiseMerge) Collaborative Software Development - M2R Interaction - Cédric Fleury !19 Collaborative Software Development - M2R Interaction - Cédric Fleury !20 Version control Version control • Tools for conflict management (SmartGit) • Tools for conflict management (SmartGit) Collaborative Software Development - M2R Interaction - Cédric Fleury !21 Collaborative Software Development - M2R Interaction - Cédric Fleury !22 Version control Version control • Conflicts management • Collaboration scenario : centralized (SVN) – To avoid conflict: ! • Users are able to "lock" a file – Only the user who locks the file can modify it – If another user try to lock a file while it is locked by another user, he receives an error message ! • Users have to manually unlock the file when they have finished to work on it. Collaborative Software Development - M2R Interaction - Cédric Fleury !23 Collaborative Software Development - M2R Interaction - Cédric Fleury !24 Version control Version control • Collaboration scenario : decentralized (Git) • Collaboration scenario : decentralized (Git) – Integrator mode • A repository is in charge of the test Inter-personal communications Collaborative Software Development - M2R Interaction - Cédric Fleury !25 Collaborative Software Development - M2R Interaction - Cédric Fleury !26 Version control Version control • Collaboration scenario : decentralized (Git) • Collaboration scenario : decentralized (Git) – Dictator mode – Multi-location team • Open-source • Each team can work independently projects • Regular integration of the work of each team • "Lieutenants" can be done make a first check before sending to the "dictator" Collaborative Software Development - M2R Interaction - Cédric Fleury !27 Collaborative Software Development - M2R Interaction - Cédric Fleury !28 Version control Version control • Historic management • Historic management – Computation of the historic is linear – SVN assigns a revision according to the « commit" order number to all the project ! – Git assigns a revision number peer file ! – This difference has a strong impact on collaboration • Using branch for collaboration is easier with Git Collaborative Software Development - M2R Interaction - Cédric Fleury !29 Collaborative Software Development - M2R Interaction - Cédric Fleury !30 Version Control Version Control • Branch management • Branch management ! – Merging branch (very complex to achieve with SVN) ! ! ! ! – SVN make a copy of the all repository – Git make a link to a particular state of the files Collaborative Software Development - M2R Interaction - Cédric Fleury !31 Collaborative Software Development - M2R Interaction - Cédric Fleury !32 Version Control Version Control • Branch management • Branch management – Each user can work on particular branches – Classical organisation – Branches can be synchronized between users of a project into branches ! http://nvie.com/posts/a- successful-git-branching-model/ Collaborative Software Development - M2R Interaction - Cédric Fleury !33 Collaborative Software Development - M2R Interaction - Cédric Fleury !34 Outline Continuous integration • Collaborative software development • Integration ! – Merging the work of several developers – Version control • Goals ! – Test modifications form the beginning – Continuous integration – Detect integration problems at an early stage ! – Avoid fastidious integration phases – Agile methods – Always have the system running • Tests, demos, discussion with the customers http://martinfowler.com/articles/continuousIntegration.html Collaborative Software Development - M2R Interaction - Cédric Fleury !35 Collaborative Software Development - M2R Interaction - Cédric Fleury !36 Continuous integration Continuous Integration • Principles • Feedbacks for collaboration – Version control on a repository – Token on the desk of the person who builds – Automatic and fast build – Auto-testing – Make a sound when a build is valid – "Commit" every day – Web page of the integration server – Deployment on an – Bubble light integration computer – Wallboard after each "commit" – Automatic deployment – Executable always available – Every body know the build state Collaborative Software Development - M2R Interaction - Cédric Fleury !37 Collaborative Software Development - M2R Interaction - Cédric Fleury !38 Outline Software development • Collaborative software development • Methods for software development ! – No methods: "Code and fix" – Version control • Efficient for small project • Difficult to add new features or to find bugs ! ! – Continuous integration – Engineering / plan-driven methodologies
Load more

Recommended publications
  • Distributed Configuration Management: Mercurial CSCI 5828 Spring 2012 Mark Grebe Configuration Management
    Distributed Configuration Management: Mercurial CSCI 5828 Spring 2012 Mark Grebe Configuration Management Configuration Management (CM) systems are used to store code and other artifacts in Software Engineering projects. Since the early 70’s, there has been a progression of CM systems used for Software CM, starting with SCCS, and continuing through RCS, CVS, and Subversion. All of these systems used a single, centralized repository structure. Distributed Configuration Management As opposed to traditional CM systems, Distributed Configuration Management Systems are ones where there does not have to be a central repository. Each developer has a copy of the entire repository and history. A central repository may be optionally used, but it is equal to all of the other developer repositories. Advantages of Distributed Configuration Management Distributed tools are faster than centralized ones since metadata is stored locally. Can use tool to manage changes locally while not connected to the network where server resides. Scales more easily, since all of the load is not on a central server. Allows private work that is controlled, but not released to the larger community. Distributed systems are normally designed to make merges easy, since they are done more often. Mercurial Introduction Mercurial is a cross-platform, distributed configuration management application. In runs on most modern OS platforms, including Windows, Linux, Solaris, FreeBSD, and Mac OSX. Mercurial is written 95% in Python, with the remainder written in C for speed. Mercurial is available as a command line tool on all of the platforms, and with GUI support programs on many of the platforms. Mercurial is customizable with extensions, hooks, and output templates.
    [Show full text]
  • Distributed Revision Control with Mercurial
    Distributed revision control with Mercurial Bryan O’Sullivan Copyright c 2006, 2007 Bryan O’Sullivan. This material may be distributed only subject to the terms and conditions set forth in version 1.0 of the Open Publication License. Please refer to Appendix D for the license text. This book was prepared from rev 028543f67bea, dated 2008-08-20 15:27 -0700, using rev a58a611c320f of Mercurial. Contents Contents i Preface 2 0.1 This book is a work in progress ...................................... 2 0.2 About the examples in this book ..................................... 2 0.3 Colophon—this book is Free ....................................... 2 1 Introduction 3 1.1 About revision control .......................................... 3 1.1.1 Why use revision control? .................................... 3 1.1.2 The many names of revision control ............................... 4 1.2 A short history of revision control .................................... 4 1.3 Trends in revision control ......................................... 5 1.4 A few of the advantages of distributed revision control ......................... 5 1.4.1 Advantages for open source projects ............................... 6 1.4.2 Advantages for commercial projects ............................... 6 1.5 Why choose Mercurial? .......................................... 7 1.6 Mercurial compared with other tools ................................... 7 1.6.1 Subversion ............................................ 7 1.6.2 Git ................................................ 8 1.6.3
    [Show full text]
  • DVCS Or a New Way to Use Version Control Systems for Freebsd
    Brief history of VCS FreeBSD context & gures Is Arch/baz suited for FreeBSD? Mercurial to the rescue New processes & policies needed Conclusions DVCS or a new way to use Version Control Systems for FreeBSD Ollivier ROBERT <[email protected]> BSDCan 2006 Ottawa, Canada May, 12-13th, 2006 Ollivier ROBERT <[email protected]> DVCS or a new way to use Version Control Systems for FreeBSD Brief history of VCS FreeBSD context & gures Is Arch/baz suited for FreeBSD? Mercurial to the rescue New processes & policies needed Conclusions Agenda 1 Brief history of VCS 2 FreeBSD context & gures 3 Is Arch/baz suited for FreeBSD? 4 Mercurial to the rescue 5 New processes & policies needed 6 Conclusions Ollivier ROBERT <[email protected]> DVCS or a new way to use Version Control Systems for FreeBSD Brief history of VCS FreeBSD context & gures Is Arch/baz suited for FreeBSD? Mercurial to the rescue New processes & policies needed Conclusions The ancestors: SCCS, RCS File-oriented Use a subdirectory to store deltas and metadata Use lock-based architecture Support shared developments through NFS (fragile) SCCS is proprietary (System V), RCS is Open Source a SCCS clone exists: CSSC You can have a central repository with symlinks (RCS) Ollivier ROBERT <[email protected]> DVCS or a new way to use Version Control Systems for FreeBSD Brief history of VCS FreeBSD context & gures Is Arch/baz suited for FreeBSD? Mercurial to the rescue New processes & policies needed Conclusions CVS, the de facto VCS for the free world Initially written as shell wrappers over RCS then rewritten in C Centralised server Easy UI Use sandboxes to avoid locking Simple 3-way merges Can be replicated through CVSup or even rsync Extensive documentation (papers, websites, books) Free software and used everywhere (SourceForge for example) Ollivier ROBERT <[email protected]> DVCS or a new way to use Version Control Systems for FreeBSD Brief history of VCS FreeBSD context & gures Is Arch/baz suited for FreeBSD? Mercurial to the rescue New processes & policies needed Conclusions CVS annoyances and aws BUT..
    [Show full text]
  • Version Control Key Points ======
    Version Control Key Points ========================== Mike Jackson, The Software Sustainability Institute. This work is licensed under the Creative Commons Attribution License. Copyright (c) Software Carpentry and The University of Edinburgh 2012. See http://software-carpentry.org/license.html for more information. Derived from Chris Cannam's original at, https://code.soundsoftware.ac.uk/projects/easyhg/wiki/SC2012BootcampPl an. .. Written in reStructuredText, http://docutils.sourceforge.net/rst.html. Prerequisites ------------- Mercurial, BitBucket. Introduction ------------ Cover VersionControl.ppt, slides 1-2. Use Mercurial command-line. EasyMercurial GUI as a visually appealing alternative - once the concepts are understood. Create a repository directory and add a file -------------------------------------------- hg and Mercury. Set an editor for providing commit messages e.g. nano. :: export EDITOR=nano Or xemacs :: export EDITOR=xemacs Or vi. :: export EDITOR=vi Create repository. :: hg init hg status file.txt "?" means repository does not know about it. :: hg add file.txt hg status file.txt "A" means repository has scheduled it for addition but not yet added it. :: hg commit file.txt abort: no username supplied message /home/user/.hgrc file contains common settings. :: [ui] username = Boot Camp <[email protected]> :: hg commit file.txt Commit message records "why" changes were made. "made a change" messages are redundant. "Commit 1, 2..." messages are redundant. Messages must have meaning to others who may read them (or the original author 6 months from now). :: hg status file.txt No information means repository knows about it and it's up-to-date. .hgignore can record files to ignore e.g. ~ files, .o files, .class files etc. :: syntax: glob *~ Add to repository.
    [Show full text]
  • Hg Mercurial Cheat Sheet Serge Y
    Hg Mercurial Cheat Sheet Serge Y. Stroobandt Copyright 2013–2020, licensed under Creative Commons BY-NC-SA #This page is work in progress! Much of the explanatory text still needs to be written. Nonetheless, the basic outline of this page may already be useful and this is why I am sharing it. In the mean time, please, bare with me and check back for updates. Distributed revision control Why I went with Mercurial • Python, Mozilla, Java, Vim • Mercurial has been better supported under Windows. • Mercurial also offers named branches Emil Sit: • August 2008: Mercurial offers a comfortable command-line experience, learning Git can be a bit daunting • December 2011: Git has three “philosophical” distinctions in its favour, as well as more attention to detail Lowest common denominator It is more important that people start using dis- tributed revision control instead of nothing at all. The Pro Git book is available online. Collaboration styles • Mercurial working practices • Collaborating with other people Use SSH shorthand 1 Installation $ sudo apt-get update $ sudo apt-get install mercurial mercurial-git meld Configuration Local system-wide configuration $ nano .bashrc export NAME="John Doe" export EMAIL="[email protected]" $ source .bashrc ~/.hgrc on a client user@client $ nano ~/.hgrc [ui] username = user@client editor = nano merge = meld ssh = ssh -C [extensions] convert = graphlog = mq = progress = strip = 2 ~/.hgrc on the server user@server $ nano ~/.hgrc [ui] username = user@server editor = nano merge = meld ssh = ssh -C [extensions] convert = graphlog = mq = progress = strip = [hooks] changegroup = hg update >&2 Initiating One starts with initiate a new repository.
    [Show full text]
  • Everything You Need to Know About Openjdk's Move to Git and Github
    Menu Topics Archives Downloads Subscribe Everything you need to know JAVA 17 about OpenJDK’s move to Git and GitHub Everything you need to know Blame or thank BitKeeper about OpenJDK’s move to Git Why not Mercurial? and GitHub Why Git? Why GitHub? Why the move, and why now? The move from Mercurial to Git Getting the source code and provided an opportunity to consolidate building the OpenJDK the source code repositories. Conclusion by Ian Darwin Dig deeper May 14, 2021 Download a PDF of this article Have you ever built your own Java Development Kit from source? Most end users of the JDK will not need to build their own JDK from the Oracle source code. I’ve needed to do that only a few times when I was running on the OpenBSD UNIX-like system, which is not one of the three supported platforms. Sure, you might want to build your own JDK to try out a new feature that you think should be added to Java. You might choose to build from source to be sure you are running a more trustworthy binary. Having the complete source code readily available, and now in a more commonly used download format, means it is easier than ever to build your own JDK. Yes, it’s a better-documented, easily configured process than in the past. But it’s still a bit confusing. The source code for the OpenJDK recently moved from the Mercurial version control system (VCS) to the Git VCS and the GitHub repository system, and that’s probably a good thing.
    [Show full text]
  • An Introduction to Mercurial Version Control Software
    An Introduction to Mercurial Version Control Software CS595, IIT [Doc Updated by H. Zhang] Oct, 2010 Satish Balay [email protected] Outline ● Why use version control? ● Simple example of revisioning ● Mercurial introduction - Local usage - Remote usage - Normal user workflow - Organizing repositories [clones] ● Further Information ● [Demo] What do we use Version Control for? ● Keep track of changes to files ● Enable multiple users editing files simultaneously ● Go back and check old changes: * what was the change * when was the change made * who made the change * why was the change made ● Manage branches [release versions vs development] Simple Example of Revisioning main.c File Changes File Version 0 1 2 3 Delta Simple Example Cont. main.c 0 1 2 3 makefilemain.c 0 1 Repository -1 0 1 2 3 Version Changeset Concurrent Changes to a File by Multiple Users & Subsequent Merge of Changes Line1 Line1 Line1 Line1 Line2 UserA Line2 UserA Line3 Line2 Line3 Line2 Line4 Line3 UserB Line3 Line4 Line4 UserB Line4 Initial file UserA edit UserB edit Merge edits by both users Merge tools: r-2 ● kdiff3 Branch Merge ● meld r-4 Merge types: ● 2-way r-1 ● 3-way Revision Graph r-3 Some Definitions ● Delta: a single change [to a file] ● Changeset: a collection of deltas [perhaps to multiple files] that are collectively tracked. This captures a snapshot of the current state of the files [as a revision] ● Branch: Concurrent development paths for the same sources ● Merge: Joining changes done in multiple branches into a single path. ● Repository: collection of files we intend to keep track of.
    [Show full text]
  • Documentation for Fisheye 2.8 Documentation for Fisheye 2.8 2
    Documentation for FishEye 2.8 Documentation for FishEye 2.8 2 Contents Getting started . 8 Supported platforms . 8 End of Support Announcements for FishEye . 12 End of Support Announcement for IBM ClearCase . 14 End of Support Announcement for Internally Managed Repositories . 14 Installing FishEye on Windows . 16 Running FishEye as a Windows service . 19 Installing FishEye on Linux and Mac . 23 Starting to use FishEye . 26 Configuring JIRA Integration in the Setup Wizard . 31 Using FishEye . 38 Using the FishEye Screens . 39 Browsing through a repository . 41 Searching FishEye . 44 Viewing a File . 49 Viewing File Content . 50 Using Side by Side Diff View . 51 Viewing a File History . 53 Viewing the Changelog . 54 FishEye Charts . 56 Using Favourites in FishEye . 61 Changeset Discussions . 64 Viewing the commit graph for a repository . 64 Viewing People's Statistics . 68 Using smart commits . 70 Changing your User Profile . 75 Re-setting your password . 79 Antglob Reference Guide . 80 Date Expressions Reference Guide . 81 EyeQL Reference Guide . 82 Administering FishEye . 88 Managing your repositories . 89 Adding an External Repository . 91 CVS . 92 Git . 93 Mercurial . 96 Perforce . 98 Subversion . 101 SVN fisheye.access . 105 SVN tag and branch structure . 106 Adding an Internal Repository . 114 Enabling Repository Management in FishEye . 115 Creating Git Repositories . 117 Forking Git Repositories . 119 Deleting a Git Repository . 122 Setting up a Repository Client . 122 CVS Client . 122 Git Client . 122 Mercurial Client . 122 Perforce Client . 123 Subversion Client . 124 Native Subversion Client . 124 SVNkit Client . 126 Re-indexing your Repository . 126 Repository Options . 128 Authentication . 130 Created by Atlassian in 2012.
    [Show full text]
  • Version Control Systems Keeping It All Together
    Version Control Systems Keeping it all together Teammates working on software need: ◦Sharing: keep the code in one place ◦Concurrent Editing: work at the same time ◦Revert: undo changes to a working state ◦History: to understand what has been done Version control systems provide all of these Consider the alternative Shared File system Consider the alternative Shared file system (e.g. NFS) only keeps the most recent version Okay… locking? Another alternative: ◦Disallow concurrent editing at the file level ◦Lock the file, work, then unlock. Still not ideal ◦Not good for working on the same code – too much coordination ◦Or, nobody looks at each other’s codes ◦Need to wait on people to unlock ◦What if you forget to lock? Completely Synchronous? How about a Google Docs approach? ◦Everyone is editing the same code at once ◦Changes are seen immediately. Nope ◦Code needs to compile. Other people will break your code immediately. ◦Still can’t work concurrently The Version Control Way Copy, Modify, Merge Take from the repository Make your changes Merge your work with the repository No conflicts: Most merges are trivial ◦(i.e. nobody else was working) ◦Conflicts: Tools can help the merge process ◦(i.e. incorporate other peoples’ changes) Merging is much easier than you think. Popular Version Control Systems Subversion ◦Central repository ◦Still commonly used today Git (we’ll use this) ◦Hottest today. Very good, but a bit advanced… ◦No central repository – everyone has the repo ◦Merging and branching is even easier Mercurial, BitKeeper, Bazaar, SourceSafe, ClearCase, CVS, RCS Coordinated Changes are: managed and agreed upon chg1 chgN Release1 chg1 chgN Release2 etc.
    [Show full text]
  • Azure Devops Server (TFS) / Azure Devops Services Plugin
    ApexSQL Azure DevOps toolkit - Azure DevOps Server (TFS) / Azure DevOps Services plugin Version 2018.x Release Notes and Requirements System requirements ApexSQL DevOps toolkit Hardware Dual Core 2.0 GHz CPU 4 GB memory SQL Server SQL Server 2005 and higher [1] OS Windows 7 SP1/Windows Server 2008 R2 SP1 and higher [1] Software .NET Framework 4.7.2 or higher ApexSQL Build 2018 R4 [3] ApexSQL Data Diff 2018 R6 [3] ApexSQL Diff 2018 R5 [3] ApexSQL Doc 2018 R4 [3] ApexSQL Enforce 2018 R6 [3] ApexSQL Generate 2018 R4 [3] ApexSQL Mask 2019 R2 [3] ApexSQL Script 2018 R4 [3] ApexSQL Trigger 2018 R3 [3] ApexSQL Unit Test 2018 R4 [3] Note The number of ApexSQL tools required is based on how extensive a CI/CD workflow pipeline is and how many steps it includes Source control integration available for Azure DevOps [4], Git [5], Mercurial [5], Subversion [5] and Perforce [5] Permissions and Windows user account with administrative privileges additional requirements See Minimum permissions required to install and use ApexSQL products See Minimum SQL Server permissions for ApexSQL Developer tools See Remote access for SQL Server instance See How to setup image based database provisioning Azure DevOps Server (TFS) / Azure DevOps Services plug-in Hardware 214 KB disk space Software TFS 2015 Update 2 or higher, Azure DevOps Services Bamboo plug-in Hardware 1.65 MB disk space Software Atlassian Bamboo 6.6.3 or higher Jenkins plugin Hardware 5.8 MB disk space Software Jenkins 2.138 or higher Octopus Deploy step templates Hardware 32 KB disk space Software
    [Show full text]
  • Revlog and Mercurial
    Towards A Better SCM: Revlog and Mercurial Matt Mackall Selenic Consulting [email protected] Things To Consider When Building A New SCM Things To Consider When Building A New SCM ● Scalable Things To Consider When Building A New SCM ● Scalable ● Atomic Things To Consider When Building A New SCM ● Scalable ● Atomic ● Decentralized Things To Consider When Building A New SCM ● Scalable ● Atomic ● Decentralized ● Convenient Branching Things To Consider When Building A New SCM ● Scalable ● Atomic ● Decentralized ● Convenient Branching ● Repeated Merge Things To Consider When Building A New SCM ● Scalable ● Atomic ● Decentralized ● Convenient Branching ● Repeated Merge ● Robust Storage Things To Consider When Building A New SCM ● Scalable ● Atomic ● Decentralized ● Convenient Branching ● Repeated Merge ● Robust Storage ● Easy to Use Things To Consider When Building A New SCM ● Scalable ● Atomic ● Decentralized ● Convenient Branching ● Repeated Merge ● Robust Storage ● Easy to Use ● Portable Early History Of Mercurial Early History Of Mercurial ● April 6, 2005: Bitmover announces end of gratis version of Bitkeeper Early History Of Mercurial ● April 6, 2005: Bitmover announces end of gratis version of Bitkeeper Linus mentions he's looking at alternatives Early History Of Mercurial ● April 6, 2005: Bitmover announces end of gratis version of Bitkeeper Linus mentions he's looking at alternatives I start working on Mercurial Early History Of Mercurial ● April 6, 2005: Bitmover announces end of gratis version of Bitkeeper Linus mentions he's looking
    [Show full text]
  • Version Control with Git Why Using Version Control?
    Version control with Git Why using version control? • Backup • Easy experimentation with parallel branches • Collaboration across teams • e.g. All of Google’s code lies in one repository • Formal software development process • Tagging of releases • Continuous integration • Pull requests, code reviews Duckietown 2 History of (non-proprietary) version control systems • 1970s: Print everything out. Duckietown 3 History of (non-proprietary) version control systems • 1990s: CVS • Independent history for each single ile. • 2000: Subversion • Client-server architecture. • Repository snapshots, introductions of branches. • 2005: Distributed Version Control (Git, Mercurial, Darcs, Bazaar, …) • Peer-to-peer network of replicated copies. • 2010s: Services on top (Github, Gitlab, …) • Issue tracking, pull requests, continuous integration, … Duckietown 4 Git • Created by Linus Torvalds (1969-, Finnish), author of Linux • Created for Linux kernel development Duckietown 5 Git • Created by Linus Torvalds (1969-, Finnish), author of Linux • Created for Linux kernel development When asked why [Linus Torvalds] called the new software, "git," British slang meaning "a rotten person," he said: “I'm an egotistical bastard, so I name all my projects after myself. First Linux, now git." source Duckietown 6 Jedi knights build their own lightsabers Duckietown 7 A roboticist’s output is typically limited by tools • Learn to use the tools that you have. • Modify the tools to it your needs. • Create new tools. • Learn enough to be able to create the tools that you need. Duckietown 8 Commit graph Duckietown 9 Commit graph master Duckietown 10 Duckietown 11 Git explained with dynamical systems Dynamical system Version control / “patch theory” state Commit graph command transition Patches function hash function (pretend injective) Duckietown 12 “Git Flow” branching model • Git does not impose any semantics on the branches.
    [Show full text]