DOCSLIB.ORG

Version Control with Subversion for Subversion 1.2 (Book Compiled from Revision 2147)

Total Page：16

File Type：pdf, Size：1020Kb

Download full-text PDF Read full-text
Version Control with Subversion for Subversion 1.2 (Book Compiled from Revision 2147) Version Control with Subversion For Subversion 1.2 (book compiled from Revision 2147) Ben Collins-Sussman Brian W. Fitzpatrick C. Michael Pilato Version Control with Subversion: For Subversion 1.2: (book com- piled from Revision 2147) by Ben Collins-Sussman, Brian W. Fitzpatrick, and C. Michael Pilato Published (TBA) Copyright © 2002, 2003, 2004, 2005, 2006 Ben Collins-SussmanBrian W. FitzpatrickC. Michael Pilato This work is licensed under the Creative Commons Attribution License. To view a copy of this license, visit ht- tp://creativecommons.org/licenses/by/2.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. Table of Contents Foreword ..................................................................................................................................xi Preface ................................................................................................................................... xiii Audience ........................................................................................................................ xiii How to Read this Book ..................................................................................................... xiii Conventions Used in This Book .......................................................................................... xiv Typographic Conventions .......................................................................................... xiv Icons ..................................................................................................................... xiv Organization of This Book .................................................................................................. xv This Book is Free ............................................................................................................. xvi Acknowledgments ............................................................................................................ xvi From Ben Collins-Sussman ....................................................................................... xvii From Brian W. Fitzpatrick ........................................................................................ xvii From C. Michael Pilato ............................................................................................ xvii 1. Introduction ............................................................................................................................1 What is Subversion? ............................................................................................................ 1 Subversion's History ............................................................................................................ 1 Subversion's Features ........................................................................................................... 2 Subversion's Architecture ..................................................................................................... 3 Installing Subversion ........................................................................................................... 4 Subversion's Components ..................................................................................................... 5 A Quick Start .....................................................................................................................5 2. Basic Concepts ........................................................................................................................8 The Repository ...................................................................................................................8 Versioning Models .............................................................................................................. 8 The Problem of File-Sharing ......................................................................................... 9 The Lock-Modify-Unlock Solution ................................................................................. 9 The Copy-Modify-Merge Solution ............................................................................... 11 Subversion in Action ......................................................................................................... 13 Working Copies ........................................................................................................ 13 Revisions ................................................................................................................. 16 How Working Copies Track the Repository ................................................................... 17 Mixed Revision Working Copies .................................................................................. 18 Summary ......................................................................................................................... 19 3. Guided Tour ......................................................................................................................... 20 Help! .............................................................................................................................. 20 Import ............................................................................................................................. 20 Revisions: Numbers, Keywords, and Dates, Oh My! ................................................................ 20 Revision Numbers ..................................................................................................... 20 Revision Keywords ................................................................................................... 21 Revision Dates ......................................................................................................... 22 Initial Checkout ................................................................................................................ 23 Basic Work Cycle ............................................................................................................. 25 Update Your Working Copy ........................................................................................ 25 Make Changes to Your Working Copy .......................................................................... 26 Examine Your Changes .............................................................................................. 27 Resolve Conflicts (Merging Others' Changes) ................................................................. 33 Commit Your Changes ............................................................................................... 36 Examining History ............................................................................................................ 37 svn log .................................................................................................................... 38 svn diff ................................................................................................................... 39 svn cat .................................................................................................................... 41 svn list .................................................................................................................... 41 A Final Word on History ............................................................................................ 42 iv Version Control with Subversion Other Useful Commands .................................................................................................... 42 svn cleanup ............................................................................................................. 42 svn import .............................................................................................................. 43 Summary ......................................................................................................................... 43 4. Branching and Merging .......................................................................................................... 44 What's a Branch? .............................................................................................................. 44 Using Branches ................................................................................................................ 44 Creating a Branch ..................................................................................................... 46 Working with Your Branch ......................................................................................... 48 The Key Concepts Behind Branches ............................................................................. 50 Copying Changes Between Branches .................................................................................... 50 Copying Specific Changes .......................................................................................... 51 The Key Concept Behind Merging ............................................................................... 53 Best Practices for Merging .......................................................................................... 54 Common Use-Cases .......................................................................................................... 57 Merging a Whole Branch to Another ............................................................................. 57 Undoing Changes ...................................................................................................... 59 Resurrecting Deleted Items ........................................................................................
Load more

Recommended publications
  • Open Source Used in Personnel 0.501
    Open Source Used In personnel 0.501 Cisco Systems, Inc. www.cisco.com Cisco has more than 200 offices worldwide. Addresses, phone numbers, and fax numbers are listed on the Cisco website at www.cisco.com/go/offices. Text Part Number: 78EE117C99-172189840 Open Source Used In personnel 0.501 1 This document contains licenses and notices for open source software used in this product. With respect to the free/open source software listed in this document, if you have any questions or wish to receive a copy of any source code to which you may be entitled under the applicable free/open source license(s) (such as the GNU Lesser/General Public License), please contact us at [email protected]. In your requests please include the following reference number 78EE117C99-172189840 Contents 1.1 aiocontextvars 0.2.0 1.1.1 Available under license 1.2 aiohttp 3.4.4 1.2.1 Available under license 1.3 aiohttp_cors 0.7.0 1.3.1 Available under license 1.4 alabaster 0.7.12 1.4.1 Available under license 1.5 amqp 2.3.2 1.5.1 Available under license 1.6 argh 0.26.2 1.7 arrow 0.8.0 1.7.1 Available under license 1.8 asn1crypto 0.24.0 1.8.1 Available under license 1.9 async-timeout 3.0.1 1.9.1 Available under license 1.10 attrs 18.2.0 1.10.1 Available under license 1.11 avro-python3 1.8.2 1.11.1 Available under license 1.12 Babel 2.6.0 1.12.1 Available under license 1.13 billiard 3.5.0.4 1.13.1 Available under license 1.14 bleach 3.0.2 Open Source Used In personnel 0.501 2 1.14.1 Available under license 1.15 boto3 1.5.15 1.15.1 Available under
    [Show full text]
  • Python Programming Language
    ภาษาโปรแกรมมิ่งไพธอน Python programming language เอกวิทยาการคอมพิวเตอรì คณะวิทยาศาสตรì มหาวิทยาลัยนเรศวร 2 รายชื่อผูéจัดทำ ชื่อ รหัสนิสิต หนéาที่ดำเนินการ นายฉัตรชัย ดำดี 46320388 แบบฝกหัด นายทรงยศ คชนิล 46320511 จัดทำเอกสารการเรียน นางสาวธัญญากร แกéวประสงคì 46320610 ผูéชèวยสอน นายประจักษì เจตะภัย 46320693 ผูéชèวยสอนและแบบฝกหัด นายมารุต จันทรìบัว 46320818 แบบฝกหัด นางสาวศรินยา อยูèสุขดี 46320925 ผูéชèวยสอน นางสาวณัฐณิชา คงประกอบ 46321097 ผูéชèวยสอน นายอุทิศ ศักดิ์สิทธิ์ 46321139 ผูéชèวยสอนและแบบฝกหัด นายอรรณพ สุวัฒนพิเศษ 46321150 ผูéสอนและจัดทำเอกสารเรียน 3 4 คำนำ ภาษาไพธอนเปนภาษาที่ไดéรับความนิยมอยèางมากในปจจุบันเนื่องจากความสามารถที่สูง, การเรียนรูéที่ รวดเร็ว, การเขียนระบบที่เขéาใจงèาย และสามารถขยายขีดความสามารถในการสรéางโปรแกรมและซอฟตìแวรì ที่สูงมากขึ้นตลอดเวลา ทางทีมผูéจัดทำจึงเล็งเห็นวèาควรนำความรูé ความเขéาใจในการเขียนโปรแกรมดéวยภาษา ไพธอนมาเผยแพรè ดéวยจะไดéผูéอื่นไดéรับความรูéและไดéเขéาถึงภาษาที่เขียนใจงèาย, ทำงานรวดเร็ว และสามารถ สรéางสรรคìงานไดéอยèางมีความสามารถสูง อีกทั้งซอฟตìแวรìที่ใชéสรéางโปรแกรมและซอฟตìแวรìดéวยภาษาไพธอน นั้นมีทั้งแจกฟรี, รหัสเปด และเชิงธุรกิจ ซึ่งมีขีดความสามารถที่แตกตèางกัน แตèถึงแมéจะเปนซอฟตìแวรìที่ใชé เขียนโปรแกรมดéวยภาษาไพธอนจะแจกฟรี หรือเปนรหัสเปด ก็ไมèไดéดéอยไปกวèาเชิงธุรกิจเลย จึงเปนทางเลือก ที่ดีที่จะศึกษาเปนทางเลือกอีกทางหนึ่งนอกเหนือจากภาษาอื่น ๆ ที่ไดéรับความนิยมอยูèแลéว ทางทีมงานจึงหวังวèาทèานผูéที่นำเอกสารนี้ไปใชéในการศึกษาจะไดéรับประโยชนìสูงสุดในการเขียนโปรแกรม และซอฟตìแวรìดéวยภาษาไพธอน ทีมผูéจัดทำ 5 6 สารบัญ 1 แนะนำภาษาไพธอน 13 1.1 ประวัติ . 13 1.1.1 Python 1.0 . 13 1.1.2 Python 2.0 . 14 1.1.3
    [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 with Subversion for Subversion 1.4 (Compiled from R2639)
    Version Control with Subversion For Subversion 1.4 (Compiled from r2639) Ben Collins-Sussman Brian W. Fitzpatrick C. Michael Pilato Version Control with Subversion: For Subversion 1.4: (Compiled from r2639) by Ben Collins-Sussman, Brian W. Fitzpatrick, and C. Michael Pilato Published (TBA) Copyright © 2002, 2003, 2004, 2005, 2006, 2007 Ben Collins-SussmanBrian W. FitzpatrickC. Michael Pilato This work is licensed under the Creative Commons Attribution License. To view a copy of this license, visit ht- tp://creativecommons.org/licenses/by/2.0/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. Table of Contents Foreword ................................................................................................................ xi Preface ..................................................................................................................xiii Audience ........................................................................................................xiii How to Read this Book ....................................................................................xiv Conventions Used in This Book .......................................................................xiv Typographic Conventions ........................................................................xiv Icons ...................................................................................................... xv Organization of This Book ..............................................................................
    [Show full text]
  • Collabnet Subversion Edge User Guide 2 | Subversion Edge | TOC
    CollabNet Subversion Edge User Guide 2 | Subversion Edge | TOC Contents Welcome to CollabNet Subversion Edge.............................................................................7 Set up Subversion Edge .......................................................................................................8 Install Subversion Edge ...........................................................................................................................8 Install Subversion Edge on Windows...........................................................................................8 Install Subversion Edge on Linux................................................................................................9 Install Subversion Edge on Solaris.............................................................................................10 Configure the server...............................................................................................................................12 Configure general server settings...............................................................................................12 Configure advanced server settings............................................................................................13 Configure authentication settings...............................................................................................13 Configure a proxy server............................................................................................................14 Configure the mail server...........................................................................................................14
    [Show full text]
  • Release Notes for Debian 7.0 (Wheezy), S/390
    Release Notes for Debian 7.0 (wheezy), S/390 The Debian Documentation Project (http://www.debian.org/doc/) November 20, 2018 Release Notes for Debian 7.0 (wheezy), S/390 This document is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. The license text can also be found at http://www.gnu.org/licenses/gpl-2.0.html and /usr/ share/common-licenses/GPL-2 on Debian. ii Contents 1 Introduction 1 1.1 Reporting bugs on this document . 1 1.2 Contributing upgrade reports . 1 1.3 Sources for this document . 2 2 What’s new in Debian 7.0 3 2.1 Supported architectures . 3 2.2 What’s new for S390? . 4 2.3 What’s new in the distribution? . 4 2.3.1 CDs, DVDs and BDs . 5 2.3.2 Multiarch . 5 2.3.3 Dependency booting . 5 2.3.4 systemd . 5 2.3.5 Multimedia . 5 2.3.6 Hardened security . 5 2.3.7 AppArmor . 6 2.3.8 The stable-backports section .
    [Show full text]
  • Rancid Server Build and Operation Overview
    Rancid Server Build and Operation Overview Installation The installation will cover the setup and configuration of a RANCID server using Fedora 15 Basic List of software • OS = Fedora15 • Rancid = Really Awesome New Cisco config Differ (http://www.shrubbery.net/rancid/) v2.3.6 • CVS = Concurrent Versions System (http://www.nongnu.org/cvs/) v1.11.23-15 • ViewVC = Front end to CVS (http://www.viewvc.org/ ) v1.1.11-1 • Python = Programming Language (http://www.python.org/ ) v2.7.1-7 • RCS = Revision Control System (http://www.cs.purdue.edu/homes/trinkle/RCS/) v5.7-37 • Apache = Linux Webserver (http://httpd.apache.org/) v2.2.17-10 • MySQL = Database (http://www.mysql.com/) v5.5.13-1 • MySQLdb = Python connector for mysql (http://sourceforge.net/projects/mysql-python) • PHP = Widely-used general-purpose scripting language that is especially suited for Web development and can be embedded into HTML (http://www.php.net/ ) • Pygments – Generic Syntax Highlighter (http://pygments.org/ ) The basic install is as follows. This is in no way a fully locked down system. 1) Install the base OS 2) Run “yum update” - this will do an upgrade of all packages on the OS 3) Reboot 4) Log into the console 5) Run the following commands (some packages may already be installed) • yum -y install expect cvs python httpd mysql mysql-server gcc make autoconf gccc++ kernel-devel mod_python • yum groupinstall “Development Tools” MySQL-python diffutils • yum install php-common php-gd php-mcrypt php-pear php-pecl-memcache phpmhash php-mysql php-xml • yum update 6) Reboot
    [Show full text]
  • Technical Notes All Changes in Fedora 13
    Fedora 13 Technical Notes All changes in Fedora 13 Edited by The Fedora Docs Team Copyright © 2010 Red Hat, Inc. and others. The text of and illustrations in this document are licensed by Red Hat under a Creative Commons Attribution–Share Alike 3.0 Unported license ("CC-BY-SA"). An explanation of CC-BY-SA is available at http://creativecommons.org/licenses/by-sa/3.0/. The original authors of this document, and Red Hat, designate the Fedora Project as the "Attribution Party" for purposes of CC-BY-SA. In accordance with CC-BY-SA, if you distribute this document or an adaptation of it, you must provide the URL for the original version. Red Hat, as the licensor of this document, waives the right to enforce, and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent permitted by applicable law. Red Hat, Red Hat Enterprise Linux, the Shadowman logo, JBoss, MetaMatrix, Fedora, the Infinity Logo, and RHCE are trademarks of Red Hat, Inc., registered in the United States and other countries. For guidelines on the permitted uses of the Fedora trademarks, refer to https:// fedoraproject.org/wiki/Legal:Trademark_guidelines. Linux® is the registered trademark of Linus Torvalds in the United States and other countries. Java® is a registered trademark of Oracle and/or its affiliates. XFS® is a trademark of Silicon Graphics International Corp. or its subsidiaries in the United States and/or other countries. All other trademarks are the property of their respective owners. Abstract This document lists all changed packages between Fedora 12 and Fedora 13.
    [Show full text]
  • Akio Sone E-Mail: [email protected]
    Akio Sone e-mail: [email protected] PROFESSIONAL EXPERIENCE January 2010 - Present Applications Analyst HW Odum Institute for Research in Social Science University of North Carolina at Chapel Hill July 2017- Present (1) impact (Infrastructure For Privacy Assured Computations) project: Development of Trusted Remote Storage Agent (https://github.com/OdumInstitute/trsa-web) August 2013 - 2017 (1) DataNet Federation Consortium: Developed storage connectors between Dataverse(DVN) and iRODS, and other related Dataverse tools https://github.com/akio-sone/jargon-modeshape https://github.com/DFC-Incubator/dataverse-publisher January 2010 - August 2013 (1) Systematic Archival Facsimile Engine (SAFE) project: Developed a Java-based LOCKSS Cache Manager and its related source-code management (https://sourceforge.net/projects/safearchive/) August 2009 - November 2009 Contract Software Engineer for Dryad Project at National Evolutionary Synthesis Center (Duke University) (1) Developed the ingest (journal-metadata submitted by e-mail) component of the Dryad Submission system. (2) Planed/designed the curation component of the Dryad system. (3) Fixed the high-priority bugs of the Dryad Submission system. January 2009 - June 30, 2009 Contract Software Engineer for the Dataverse Network Project(see below) at the UNC at Chapel Hill, Odum Inst. for Research in Social Science (1) Re-designed/re-write the ingest component in Java April 2000 - January 2009 Software Engineer (2008-2003: Research Associate ; 2003-2000: Post- doctoral Research Fellow) Dataverse
    [Show full text]
  • Viewtier Parabuild 3.1 Administrator's Manual Viewtier Parabuild 3.1: Administrator's Manual Copyright © 2004-2008 Viewtier Systems
    Viewtier Parabuild 3.1 Administrator's Manual Viewtier Parabuild 3.1: Administrator's Manual Copyright © 2004-2008 Viewtier Systems Table of Contents Preface .....................................................................................................................ix About This Manual ............................................................................................. ix Audience ..........................................................................................................ix Technical Support .............................................................................................. ix 1. Build Statuses Page .................................................................................................. 1 List View Mode ..................................................................................................1 Detailed View Mode ............................................................................................ 1 Build Control Commands ..................................................................................... 1 2. System Configuration ............................................................................................... 3 General System Settings ....................................................................................... 3 E-Mail Settings ........................................................................................... 3 Appearance Settings .................................................................................... 5 Stability Settings
    [Show full text]
  • Version Control Systems, Documentation Management & Helpdesk
    Version Control Systems, Documentation Management & Helpdesk __ .-. | | | |M|_|A|N| |A|a|.|.|<\ |T|r| | | \\ |H|t|M|Z| \\ ”Bookshelf” by | |!| | | \> David S. Issel ”””””””””””””””””” System and Network Administration Revision 2 (2020/21) Table of contents ▶ VCS History ▶ VCS Operations ▶ Hosting VCS UI ▶ Documention Management ▶ Bug-Tracking & Helpdesk Systems VCS History What is it good for?… ▶ dealing with large amount of code ▶ dealing with large development team ▶ trace back issues and incriminating commits what content to version control? ▶ for code, obviously ▶ documentation (Markdown, RST) ▶ web design (CSS) ▶ (anything text-based) even binaries with Git Large File Storage (LFS) –> pointers instead of blobs Two bits of history… ▶ 1st gen: pessimistic ▶ 2nd gen: optimistic ▶ 3rd gen: distributed Pessimistic ▶ Source Code Control System (SCCS) ▶ GNU Revision Control System (RCS) –> file locks Optimistic ▶ Concurrent Versions System (CVS) ▶ Subversion (SVN) ▶ Helix Core (Perforce) –> merging when no conflicts –> fix conflicts manually Distributed VCS // nvie.com How can alice have two git remotes?… (same for david) Distributed ▶ BitKeeper (open-sourced 2016) ▶ Darcs ▶ Mercurial ▶ GIT ▶ GNU Bazaar –> even branches can merge… How to fix conflicts?… ==> you get to edit the conflicting changes manually during commits (very similarly as with CVS) CVS in theory ▶ local copy of remote repository ▶ remote is kind of bare… ▶ commit == push your change to the online and centralized repository ▶ no staging ▶ use tag (branch) to track a (rather
    [Show full text]
  • Polycom Realpresence Group Series Offer of Source for Open Source
    OFFER OF SOURCE FOR OPEN SOURCE SOFTWARE 1.0 | November 2016 | 3725-84024-001A Polycom® RealPresence ISDN Gateway Polycom, Inc. 0 Polycom RealPresence ISDN Gateway device Offer of Source for Open Source Software Polycom, Inc. Copyright© 2016, Polycom, Inc. All rights reserved. No part of this document may be reproduced, translated into another language or format, or transmitted in any form or by any means, electronic or mechanical, for any purpose, without the express written permission of Polycom, Inc. 6001 America Center Drive San Jose, CA 95002 USA Polycom®, the Polycom logo and the names and marks associated with Polycom products are trademarks and/or service marks of Polycom, Inc. and are registered and/or common law marks in the United States and various other countries. All other trademarks are property of their respective owners. No portion hereof may be reproduced or transmitted in any form or by any means, for any purpose other than the recipient's personal use, without the express written permission of Polycom. End User License Agreement By installing, copying, or otherwise using this product, you acknowledge that you have read, understand and agree to be bound by the terms and conditions of the End User License Agreement for this product. Patent Information The accompanying product may be protected by one or more U.S. and foreign patents and/or pending patent applications held by Polycom, Inc. Open Source Software Used in this Product This product may contain open source software. You may receive the open source software from Polycom up to three (3) years after the distribution date of the applicable product or software at a charge not greater than the cost to Polycom of shipping or distributing the software to you.
    [Show full text]