DOCSLIB.ORG

0000000000000000000000000

Total Page：16

File Type：pdf, Size：1020Kb

Download full-text PDF Read full-text
0000000000000000000000000 Why use version control? Setting up CVS Saves all previous versions of all files so that Create the repository: you can undo (buggy) edits. % mkdir ~/cvsroot % [set permissions for ~/cvsroot] % setenv CVSROOT ~/cvsroot Logs changes to files so you can trace how % cvs init your sources have evolved over time. Set the CVSROOT environment variable in Mediates conflicting changes made by your .cshrc file. several different users---helps keep consistency. Repository Creating a Project Project 1 Project 2 Project 3 Create a project from existing files: % cd base64 % cvs import -m “base64” base64 carlk start Checkout the new project and delete the old files. % cvs checkout base64 Working copies Development Process with CVS Dealing with Conflicts If another user has committed changes to Get working copy Get any changes cvs checkout cvs update lines you have edited, CVS will report a conflict. Your version Edit files decode (infile, stdout); <<<<<<< decode64.c if( fclose (infile) ) return 0; ======= cvs commit if( fclose (infile) ) printf(" couldn't close file."); >>>>>>> 1.5 no Repository version Conflicts? Manually edit to remove the conflict. yes cvs update Edits on different lines are automatically Most of the merged. Resolve time you stay conflicts in shaded loop. 1 Frequently Used Commands Keywords Get the latest revisions of files with: Useful to put dynamic information in source file. % cvs update When you get a new revision, keywords are replaced with information about the file. Write changes back to repository with: % cvs commit -m“log msg” Keyword Replaced with $Author$ Username who checked in this revision. If you omit –m the editor given in the EDITOR $Date$ Date the this revision was checked in. environment variable will be started. $Id$ A string containing the filename, revision, author, date, and some status info. Useful Add files to project with: at tops of files. % cvs add -m“log msg” files… $Revision$ The revision number of this file. Use -kb for binary files. $Log$ The complete history of this file. Remove files from project with: /* $Id$ * Author: $Author$ % rm file.c * $Log$ % cvs remove -m“log msg” file.c */ /* $Id: decode64.c,v 1.2 2001/04/01 17:32:45 carlk Exp $ * Author: $Author: carlk $ Most commands default to work on the current * $Log: decode64.c,v $ * Revision 1.2 2001/04/01 17:32:45 carlk directory and all its subdirectories. * added keywords */ Tracking Changes Tracking Repository History View history of commits: 1.1 diffs1.2 diffs 1.3 % cvs history –c Can view other events: % cvs history –x event_codes CVS keeps track of all revisions of your files. Code Event O Checkout command issued. View changes between two revisions: C Conflict detected. % cvs diff -r 1.2 -r 1.3 file G Merging was necessary (but no conflicts). % cvs –D “Apr 2” –D “Apr 3” file U A working file was copied from the repository. A A file was added. View the log comments: M A file was modified. % cvs log file R A file was removed. View when each line changed: e.g. % cvs annotate file % cvs history –x AR main.c 2 Getting Previous Versions Tags Tags associate a name with a set of particular Retrieve a given revision with: revisions of some files. Useful to mark a “release.” % cvs update -r 1.1 files… % cvs update –D “Apr 2” files… Create a new tag with: % cvs tag mytag main.c encode.c … Date can be in just about any reasonable format. Checkout a set of tagged files with: % cvs checkout -r mytag All subsequent updates will get given tag revision. 1.1 1.2 1.3 main.c 1.3 Start getting the most recent version: encode.c % cvs update -A files… 1.2 decode.c Remembering version numbers and dates can be 1.1 utils.c hard; use symbolic tags (next slide). Time Commit point Ignoring Files Running Scripts on Events Can force CVS to run shell scripts on events Many types of files should not go into the like commit. repository (*.bak, *.o, core) --- CVS ignores cvsroot/CVSROOT most of these. contains a file called commitinfo with lines of the following format: Can make CVS ignore any file by putting base64.* myshellscript file patterns into ~/.cvsignore.Eg. Regexp Shell script to matching run. encode64 directory name. decode64 *.gif If regexp matches the directory of a committed file, myshellscript will be run. CVS won’t include matching files in any Regexp can also be ALL or DEFAULT. commit or update operation. If myshellscript exits with non-zero status, It won’t generate warning messages if these commit will not be allowed. files are not in the repository. Similar mechanisms for other events. 3 CVS Over the Network CVS On Other Platforms CVS home page has clients for Windows XX, Repository Client Linux, and other Unix flavors. Computer ssh/rsh Computer (e.g. hats) http://www.cvshome.org/ No server process required. On other platforms, setup and use is similar, Uses ssh/rsh to communicate. On client: but exact syntax may differ. CVS home page also has excellent manual. % setenv CVS_RSH ssh Setup ssh so that it doesn’t ask for a password. SourceForge hosts open source projects for 1. generate keys with no password free. They provide: 2. put the public key file on server, add to CVS repositories authorization file. web servers 3. add hostname username to .shosts. compile farm and more… Client sets CVSROOT to: http://sourceforge.net/ :ext:[email protected]:dir/cvsroot CVS Quick Reference File Manipulation add Add a file or directory to be managed by CVS. % cvs add -m “new feature” mult.c remove Mark a file deleted in the repository; all previous versions will still be available. You should remove the working copy before issuing the this command. %rmmult.c % cvs remove -m “deleted feature” mult.c update Copy the most recent versions of the given files into the working directory. File defaults to “.”. commit Merge any changes made back into the repository. % cvs commit -m “fixed bug” mult.c tag Create a tag or a branch. File Information status Show information about files. Use -v to see what tags are attached to the files. diff Show the changes made between any two versions of a file. Defaults to showing the changes between working copy and most recent version. log Show the historyof given files. Setup init Create a new repository (probably only need to do this once). % cvs init -d ~/cvsroot import Create a new project from existing sources (in current directory). % cvs import -m “prj” prjname vendtag reltag Most commands take -m to specify a log message and -r to operate on a given revision/tag. 4.
Load more

Recommended publications
  • Auswirkungen Der Benutzung Von Zentralen Und Dezentralen Versionsverwaltungssystemen in Open Source Projekten
    Auswirkungen der Benutzung von zentralen und dezentralen Versionsverwaltungssystemen In Open Source Projekten Masterarbeit an der Freien Universität Berlin für den Abschluss zum Master of Computer Science Jana von dem Berge 16. April 2009 Fachbereich Mathematik und Informatik Arbeitsgruppe Software Engineering Betreuer: Christopher Oezbek II Selbstständigkeitserklärung: Hiermit erkläre ich, dass ich diese Arbeit vollkommen selbständig verfasst und keine anderen als die angegebenen Quellen und Hilfsmittel benutzt sowie Zitate kenntlich gemacht habe. Berlin, 16. April 2009 Jana von dem Berge III IV Inhalt 1 Einleitung............................................................................................................. 1 1.1 Open Source Projekte .................................................................................. 1 1.2 Aufgabenstellung.......................................................................................... 1 1.3 Versionsverwaltungssysteme....................................................................... 3 1.3.1 Einführung............................................................................................. 3 1.3.2 Zentrale Versionsverwaltungssysteme.................................................. 5 1.3.3 Dezentrale Versionsverwaltungssysteme ............................................. 8 2 Forschungsmethode.......................................................................................... 10 2.1 Grounded Theory ......................................................................................
    [Show full text]
  • Technical Report
    Eric-Hg Technical Report S-PM 140524 Mercurial Version Control of Eric Projects Technical Report – 1 – Eric-Hg Technical Report Copyright Page S-PM 140400 No commercial uses, No modifications allowed; Jurisdiction International, Format Text This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/3.0/ or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA. Current edition PDF file, Eric_Deliver site URL: http://www.box.net/shared/k64yenrpey under the “Creative Commons License” Disclaimer The information in this document is subject to change without notice. The author and publisher have made their best efforts about the contents of this book, nevertheless the author and the publisher make no representation or warranties of any kind with regard to the completeness or accuracy of the contents herein and accept no liability of any kind including but not limited to performance, merchantability, fitness for any particular purpose, or any loss or damages of any kind caused or alleged to be caused directly or indirectly from this book. Brand Names Brand names such as Linux, Windows, Python are assumed to be universally known, and are here used in full respect of their respective owners. Planned edition On paper, under traditional copyright Published by [not yet—just appointed] Town & Country Reprographics, Inc. 230 N Main St Concord, NH 03301 (U.S.A.) All rights reserved No part of this book may be reproduced, if not for personal use, in any form or by any means, such as: graphic, electronic, or mechanical, including photocopying, recording, videotaping, or information storage and retrieval systems, without written permission of the publisher.
    [Show full text]
  • Tortoisecvs User's Guide Version 1.8.0
    TortoiseCVS User's Guide Version 1.8.0 Ben Campbell Martin Crawford Hartmut Honisch Francis Irving Torsten Martinsen Ian Dees Copyright © 2001 - 2004 TortoiseCVS Table of Contents 1. Getting Started What is CVS? What is TortoiseCVS? Where to Begin? 2. Basic Usage of TortoiseCVS Sandboxes Checking out a Module Windows Explorer and TortoiseCVS Total Commander and TortoiseCVS Updating your Sandbox Committing your Changes to the Repository Resolving Conflicts Adding Files and Directories to the Repository 3. Advanced Usage of TortoiseCVS Creating a New Repository or Module Watch, Edit and Unedit Tagging and Labeling Reverting to an Older Version of a File Branching And Merging Creating a Branch Selecting a Branch to Work On Merging from a Branch Going Back to the Head Branch Binary and Unicode Detection File Revision History History Dialog Revision Graph Dialog Web Log Making a Patch File 4. Customizing TortoiseCVS Overlay Icons Selecting a Different Set of Overlay Icons Changing how the Overlay Icons Work 5. Command Reference for TortoiseCVS Installing TortoiseCVS Obtaining a Working Copy: CVS Checkout... Getting Other People's Changes: CVS Update CVS Update Special... Making Your Changes Available to Others: CVS Commit... Adding New Files: CVS Add and CVS Add Contents... Discarding Obsolete Files: CVS Remove Finding Out What Has Changed: CVS Diff... Making a Snapshot: CVS Tag... Lines of Development: CVS Branch... CVS Merge... CVS Make New Module Watching And Locking Finding Out Who to Blame: CVS Annotate Showing More Information: CVS Explorer Columns Keyboard Shortcuts How Web Log Autodetects the Server URL 6. Dialog Reference for TortoiseCVS Add Dialog Checkout Dialog Update Special Dialog Commit Dialog Branch Dialog Make New Module Dialog Progress Dialog Tag Dialog Preferences Dialog Merge Dialog History Dialog Revision Graph Dialog About Dialog 7.
    [Show full text]
  • When Developers Build Software, They're Able to Keep Track of All The
    < Day Day Up > Practical Perforce By Laura Wingerd ............................................... Publisher: O'Reilly Pub Date: November 2005 Print ISBN-10: 0-596-10185-6 Print ISBN-13: 978-0-59-610185-5 Pages: 358 Table of Contents | Index When developers build software, they're able to keep track of all the different versions and all the components they use with software configuration management (SCM) systems. One of the more popular SCM products is Perforce. Authored by Perforce's own VP of product technology, Practical Perforce is the ideal complement to the existing product manual, focusing less on the 'how" and more on the "why" and "when." The book is not only a helpful introduction to Perforce, it's an enlightening resource for those already familiar with this versatile SCM product. Whether you're a programmer, product manager, or build engineer, you stand to benefit from the many insider tips and ideas presented in this convenient guide. Practical Perforce is divided into two main parts. Part I offers a whirlwind technical tour, complete with careful descriptions of basic and advanced Perforce commands designed to give you a baseline knowledge. Part II describes the big picture-using Perforce in a collaborative software development. It outlines recommended best practices and quickly shows how to implement them with the Perforce operations introduced in Part I. Throughout the book, you'll learn how to maximize Perforce so it completes tasks like these in the most efficient manner possible: Keep track of changes as you conduct concurrent parallel work on files Log activity Generate reports on who did what when Compare, merge and branch files Store files and file configurations Restore lost bug fixes Recognizing the pitfalls and practices of an SCM system like Perforce is absolutely essential to producing good software.
    [Show full text]
  • Version Management with CVS
    Version Management with CVS for cvs 1.11.22 Per Cederqvist et al Copyright c 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Portions Copyright c 1999, 2000, 2001, 2002, 2003, 2004, 2005 Derek R. Price, Copyright c 2002, 2003, 2004, 2005 Ximbiot http://ximbiot.com, Copyright c 1992, 1993, 1999 Signum Support AB, and Copyright c others. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified versions of this manual under the conditions for verbatim copying, provided also that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. Permission is granted to copy and distribute translations of this manual into another lan- guage, under the above conditions for modified versions, except that this permission notice may be stated in a translation approved by the Free Software Foundation. i Short Contents 1 Overview ..................................... 1 2 The Repository................................. 7 3 Starting a project with CVS ....................... 29 4 Revisions .................................... 33 5 Branching and merging .......................... 41 6 Recursive behavior ............................. 51 7 Adding, removing, and renaming files and directories ...... 53 8 History browsing ............................... 59 9 Handling binary files ............................ 61 10 Multiple developers ............................. 63 11 Revision management ........................... 73 12 Keyword substitution............................ 75 13 Tracking third-party sources ....................... 79 14 How your build system interacts with CVS ............. 83 15 Special Files .................................. 85 A Guide to CVS commands ......................... 87 B Quick reference to CVS commands .................
    [Show full text]
  • Version Control
    Version Control So#ware Quality Quality Audit and Cer2ficaon Master in Computer Engineering Roberto García ([email protected]) Introduc2on • Change-control procedures. Avoid uncontrolled changes, destabilize and degrade quality: • In requirements, disrupt design and coding • In design, code disagrees with requirements • In the code, inconsistencies and uncertain2es about what has been reviewed and tested – Version Control Systems (VCS): • Standalone (CVS, Subversion, Git,…) • Word processors (MicrosoL Office, OpenOffice,…) • Content Management Systems (Drupal, Joomla,…) • Wikis (MediaWiki, TWiki, Trac (wiki+svn)…) Features • Backup and Restore. Files are saved as they are edited, and you can jump to any moment in 2me • Synchronizaon. Lets people share files and stay up-to-date with the latest version • Short-term undo. Throw away your changes and go back to the “last known good” version in the database • Long-term undo. Jump back to the old version, and see what change was made that day • Track Changes. As files are updated, you can leave messages explaining why the change happened (stored in the VCS) • Track Ownership. A VCS tags every change with the name of the person who made it • Sandboxing. You can make temporary changes in an isolated area and test before “checking in” changes • Branching and merging. A larger sandbox. You can branch a copy of your code into a separate area and modify it in isolaon (tracking changes separately). Later, you can merge your work back into the common area Basic Setup • Repository (repo): The database storing the files • Server: The computer storing the repo • Client: The computer connec2ng to the repo • Working Set/Working Copy: Your local directory of files, where you make changes • Trunk/Main: The primary locaon for code in the repo, the main development line Basic Ac2ons • Add: Put a file into the repo and begin tracking it • Revision: What version a file is on (v1, v2, v3,...) • Head: The latest revision in the repo • Check out: Download a file from the repo • Check in: Upload a file to the repository (if it has changed).
    [Show full text]
  • Download the Wincvs-1.3 User Guide
    Users Guide Don Harper November 1, 2001 Copyright 2001 Don Harper Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice are preserved on all copies. Permission is granted to copy and distribute modified version of this manual under the conditions for verbatim copying, provided also that the entire resulting derived work is distributed under the terms of a permission notice identical to this one. 2 Section 1 – Introduction ................................................................................................................... 5 Section 2 – Download and Installation ............................................................................................ 6 Section 3 – CVS Repository Configuration...................................................................................... 7 3.1 Local – Direct Access to Local Repository .........................................................................................7 3.2 Pserver, Rhosts, and Ssh – Remote Repository on Non-Windows Server.......................................7 3.3 Ntserver – Remote Repository on Windows Server ..........................................................................7 Section 4 – Beginners Guide to WinCvs .......................................................................................... 8 4.1 Running WinCvs for the First Time ...................................................................................................8 4.2 Setting WinCvs Preferences...............................................................................................................10
    [Show full text]
  • Buildbot This Is the Buildbot Manual
    BuildBot This is the BuildBot manual. Copyright (C) 2005, 2006, 2009, 2010 Brian Warner Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. i Table of Contents 1 Introduction..................................... 1 1.1 History and Philosophy ........................................ 1 1.2 System Architecture............................................ 2 1.2.1 BuildSlave Connections.................................... 3 1.2.2 Buildmaster Architecture .................................. 4 1.2.3 Status Delivery Architecture............................... 6 1.3 Control Flow ................................................... 6 2 Installation ...................................... 8 2.1 Requirements .................................................. 8 2.2 Installing the code ............................................. 8 2.3 Creating a buildmaster ......................................... 9 2.4 Upgrading an Existing Buildmaster............................ 10 2.5 Creating a buildslave.......................................... 10 2.5.1 Buildslave Options ....................................... 12 2.6 Launching the daemons ....................................... 13 2.7 Logfiles ................................................... .... 14 2.8 Shutdown ................................................... 14 2.9 Maintenance .................................................. 15 2.10 Troubleshooting.............................................
    [Show full text]
  • Lpi Linux Certification in a Nutshell
    LPI LINUX CERTIFICATION IN A NUTSHELL LPI LINUX CERTIFICATION IN A NUTSHELL Third Edition Adam Haeder, Stephen Addison Schneiter, Bruno Gomes Pessanha, and James Stanger Beijing • Cambridge • Farnham • Köln • Sebastopol • Taipei • Tokyo LPI Linux Certification in a Nutshell, Third Edition by Adam Haeder, Stephen Addison Schneiter, Bruno Gomes Pessanha, and James Stanger Copyright © 2010 Adam Haeder, Stephen Addison Schneiter, Bruno Gomes Pessanha, and James Stanger. All rights reserved. Printed in the United States of America. Published by O’Reilly Media, Inc., 1005 Gravenstein Highway North, Sebastopol, CA 95472. O’Reilly books may be purchased for educational, business, or sales promotional use. Online editions are also available for most titles (http://my.safaribooksonline.com). For more infor- mation, contact our corporate/institutional sales department: 800-998-9938 or [email protected]. Editor: Andy Oram Indexer: Jay Marchand Production Editor: Adam Zaremba Cover Designer: Karen Montgomery Copyeditor: Genevieve d’Entremont Interior Designer: David Futato Proofreader: Jennifer Knight Illustrator: Robert Romano Printing History: May 2001: First Edition. July 2006: Second Edition. June 2010: Third Edition. Nutshell Handbook, the Nutshell Handbook logo, and the O’Reilly logo are registered trade- marks of O’Reilly Media, Inc. LPI Linux Certification in a Nutshell, the image of a bull, and related trade dress are trademarks of O’Reilly Media, Inc. Many of the designations used by manufacturers and sellers to distinguish their products are claimed as trademarks. Where those designations appear in this book, and O’Reilly Media, Inc. was aware of a trademark claim, the designations have been printed in caps or initial caps. While every precaution has been taken in the preparation of this book, the publisher and authors assume no responsibility for errors or omissions, or for damages resulting from the use of the information contained herein.
    [Show full text]
  • Best Practices for Web Developers V1.01
    Best Practices for Web Developers v1.01 by Kate Rhodes ( masukomi at masukomi dot org ) May 18, 2007 1 This work is licensed under a Creative Commons Attribution-Noncommercial-No Derivative Works 3.0 License. http://creativecommons.org/licenses/by-nc-nd/3.0/ Contents 1 Let’s get a few things straight 3 2 Tools, tools, tools 4 3 Getting version control right 5 3.1 Youhaveaproductionbranch. 6 3.2 Emergencybugfixesstartwithproduction. 6 3.3 Exploring new functionality starts with a new branch. 6 3.4 You have a main development branch. 7 3.5 You are not using a version control system that makes branching and merging a pain. 7 3.6 You are not using CVS anymore. 7 3.7 You have started using a version control system that’s actually good.......... 8 4 Testing 10 4.1 Basictestingconcepts ............................... 11 4.1.1 Unittesting..................................... 11 4.1.2 Functional / Acceptance testing . 11 4.1.3 Integration testing . 12 4.1.4 Systemtesting ................................... 12 4.2 HeuristicDrivenDevelopment. 13 4.2.1 Triage . 13 4.2.2 When things break. 14 4.2.3 Your development environment . 15 2 CONTENTS 3 5 Optimization & load tests 16 5.1 Triage based on predicted usage. 16 5.2 Create test data early in realistic amounts. 17 5.3 Mirror your production environment. 17 5.4 Learn to use profiling software. 18 5.5 Setsometargets. ..................................... 18 5.6 Usediversionarytactics. .... ........ ....... ........ .. 18 5.7 Loadtestingrulesofthumb... ........ ....... ........ ... 19 6 Application deployment 20 6.1 Rulesofthumb ...................................... 20 6.1.1 Your live webapp is never in a state that can’t be rolled back to in the future.
    [Show full text]
  • CVS-RCS- HOW-TO Document for Linux (Source Code Control System)
    CVS−RCS− HOW−TO document for Linux (Source Code Control System) CVS−RCS− HOW−TO document for Linux (Source Code Control System) Table of Contents CVS−RCS− HOW−TO document for Linux (Source Code Control System)...............................................1 Al Dev (Alavoor Vasudevan) alavoor@yahoo.com................................................................................1 1.Introduction...........................................................................................................................................1 2.Which one is for me? CVS or RCS......................................................................................................1 3.Setting up CVS ....................................................................................................................................1 4.Shell Scripts .........................................................................................................................................1 5.CVS Documentation ............................................................................................................................2 6.Emacs Editor ........................................................................................................................................2 7.Problem Reporting System ..................................................................................................................2 8.Other Formats of this Document...........................................................................................................2
    [Show full text]
  • Working with SVN
    MNXB01 2015 Working with SVN Florido Paganelli Lund University [email protected] Florido Paganelli Working with SVN Tutorial 2b 1/66 Outline What are version/revision control systems Generic concepts of version/revision systems SVN Generic concepts of SVN SVN tutorial Florido Paganelli Working with SVN Tutorial 2b 2/66 Notation I will be using the following color code for showing commands: Application options and values Application or program Second parameter in different formats to command command to application First parameter to command app command --option=value -option value inputpar otherinputpar BLANK SPACES Florido Paganelli Working with SVN Tutorial 2b 3/66 Why version/revision systems? Say you wrote some piece of code. You discover a bug and you want to change it. You fix the bug, save the code. Try the program again and… it doesn't work! What went wrong? Would be nice if you could compare what you changed... Solution: make a backup copy before every change! Version systems make it easy to backup and compare changes Florido Paganelli Working with SVN Tutorial 2b 4/66 Why version/revision systems? If you do many changes, you might not remember what changes you made. Version systems allow you to attach a comment to the change. If you want to share your code with other developers, it's nice if everybody can see who changed what. Version systems allow you to author the changes so the others know what you're done. This helps sharing code. Florido Paganelli Working with SVN Tutorial 2b 5/66 Why version/revision systems? Summary: Backup each change in your code Compare different versions of your code Comment and annotate each change Share among developers Florido Paganelli Working with SVN Tutorial 2b 6/66 Concepts of version systems Repository: A database that contains the list of changes made.
    [Show full text]