Concurrent Versions System (cvs( cvs) Adviser Date August 31, 2004

Transcription

1 Concurrent Versions System (cvs( cvs) Speaker 李 Adviser 老 Date August 31, 2004

2 Outline Introduction Features of CVS Basic problem Step by step for WinCvs Q&A CVS setting

3 Why CVS Has one of your project ever experienced like this Which is the latest version version control

4 What is CVS Concurrent version systems It s like having your source files on a file server and coordinate with your colleagues on the version number you re working on.

5 Client-server architecture client-server architecture no shared file systems Central Repository

6 Essential CVS Terminology Repository The CVS server stores a copy of the software and data that the project has uploaded to that server. The server retains both the most recent version of each file and every historical version of the file (past changes). Module Modules are alias names to projects kept in the repository and just the top level directories in the repository. Working copy The copy of the data you get from the CVS server is called a "working copy". command

7 The CVS Repository ewacvs:/home/cvsroot CVSROOT shr project1 project2 project3 devkits ar cgi doc install reports util web cgipr unix nt esapps forms Resides on a server No working files inside the repository

8 CVS features CVS creates a file system that tracks each of the changes made by developers including what was changed, when it was changed, and who made the change. CVS ensures that the changes made by each developer do not accidentally overwrite changes made by other developers. All the files are edited outside of the repository and in some phase synchronized with the repository. Files are moved to, from and updated from repository with special tool called cvs, which is available for most platforms. CVS supports Binary files.

9 Revision numbers Every file in a CVS repository can contain many versions, which are given version numbers in form x.y[.x.y[...]]. The history of each file is tracked with an incrementing revision number. Revision numbers have the format 1.25 if they're on the main trunk, branches have something like For each revision there is a log entry.

10 Revision numbers

11 Concurrent checkout Master Repository foo.c Jack Working Copy V1.7 checkin V1.8 or 1.9 checkout latest Mary checkout V1.1 Working Copy V1.1 X checkout V1.2 Bob Working Copy V1.2 X checkin prohibited checkout branch rel_1_fix checkout latest John Working Copy V1.7 checkin V1.8 or 1.9 Sundar Working Copy V checkin V

12 Ideal case development checkout checkin update Developer A repository Developer B

13 Real case conflict development update Check resolution in out Developer A repository conflict X Developer B

14 CVS and the Development Cycle 1. Check out source files in working directory. 2. Edit source files. 3. Unit test your code. 4. Update working files to merge in changes from other developers (if necessary). 5. Test again if the sources were merged on step Commit changes. 7. Repeat from step 2 until you have a new release. 8. Tag the release. 9. Submit the module name and release tag for integration build.

15 Preparation for using CVS Installing/Setting CVS Server Linux cvs, cvsmalier, cvsweb Windows cvsnt (not discussed here) Installing/Setting CVS Client Linux cvs, gcvs Windows wincvs + cygwin (for ssh, optional but recommended) + diff

16 Setting up the client setting the environment variable - edit ~/.bash_profile using ssh (recommended) # for cvs export CVSROOT= ext user@hostname /home/cvsroot export CVS_RSH=ssh export CVSEDITOR=joe

17 Common commands cvs [cvs-options] command [command-options] [files] import Import sources into CVS status Show status of checked out files checkout Checkout sources for editing commit Check files into the repository add Add new file/directory to repository

18 Common commands remove Remove an entry from the repository update Bring working files into sync with repository diff Show differences between revisions tag Label the sources log Show log messages for files export Export sources from CVS back

19 Wincvs step by step 1. Beginning to use 2. Import 3. Checkout 4. Status 5. Add/remove 6. Rename 7. Modify 8. Solve the conflict 9. Checkout the past version 10. Branch 11. Keyword substitution command import status checkout commit add remove update diff tag log export synonyms im imp st stat co get ci com ad new rm delete up upd di dif ta freeze lo rlog ex exp

20 state icon revision number file type tag name WinCVS: Main screen modules file view status view

21 Beginning to use

22 Beginning to use

23 Import

24 Checkout

25 Status

26 Add Add a new file or folder to the existing module The add command is not recursive The add command just adds the file to the local working directory commit Step Create a new file or folder cvs add cvs commit

27 Add

28 Add

29 Add

30 Remove Remove a file or folder from repository Step Remove a file (Delete) cvs remove cvs commit Remove a folder Delete all file in the folder cvs remove cvs commit cvs update -P Delete the folder

31 Rename Step Rename a file Rename in local directory cvs remove old cvs add new cvs commit Rename a folder Create a new folder cvs add new folder Move files in old to new cvs add files in new cvs commit cvs update

32 Rename

33 Rename remove

34 add Rename

35 Rename

36 Rename

37 Modify

38 Modify commit

39 Solve the conflict

40 Solve the conflict

41 Solve the conflict

42 Solve the conflict

43 Solve the conflict

44 Solve the conflict

45 Solve the conflict

46 Solve the conflict

47 Solve the conflict

48 Solve the conflict

49 Checkout the past version By tag By time By revision By branch 1 month ago 2 hours ago seconds ago last year last Monday Yesterday a fortnight ago 3/31/92 10:00:07 PST January 23, :05pm 22:00 GMT

50 Checkout the past version

51 Checkout the past version

52 Checkout the past version

53 Checkout the past version

54 Tag

55 Create a branch

56 Create a branch

57 Create a branch

58 Create a branch

59 Create a branch

60 Create a branch

61 Graph

62 Graph

63 Keyword substitution Keeping some kinds of information automatically up to date in your files. Example $Revision$ $Revision 1.5$ $Date$ $Date 1999/08/23 18:21:13$ $Log$ $Log hello.c,v $ Revision /08/22 08:20:13 skies modify work5_branch$ $Id$

64 Keyword substitution

65 Source File Header for CVS

66 CVSweb Read-only web interface for CVS repositories Displaying each file's revision and diffs of different revisions Download from

67 CVSweb directory listing

68 CVSweb history viewing

69 CVSweb diff between two files

70 Links Official CVS site WinCvs Cygwin Red-bean sourceforge WinCVS via SSH cvsmailer cvsweb

71 Thank you Q A

72 Setting up the server 1. Build the repository $groupadd g 500 cvs $adduser -u g 500 cvsroot 2. Add users to the cvs group 3. Change the mode of /home/cvsroot 4. Initialize the cvs $cvs d /home/cvsroot init

73 Setting up the server 5. Confirm the port joe /etc/service cvspserver 2401/tcp #CVS client/server operations cvspserver 2401/udp #CVS client/server operations 6. Restart xinetd /etc/rc.d/init.d/xinetd restart 7. Enjoy it

74 CVSweb setting For cvsweb-2.05/6 1. Copy files cp cvsweb.conf cp cvsweb.cgi /etc/httpd/conf/ /var/www/cgi-bin 2. Change mode cd /var/www/cgi-bin/ chmod a+x cvsweb.cgi

75 CVSweb setting 3. Modify cvsweb.cgi (col 160) for ( $mydir/cvsweb.conf, /etc/httpd/conf/cvsweb.conf ) { Ps.1st col # usr/bin/perl wt delete T 4. Modify cvsweb.conf col 46 local => [ Local Repository, /home/cvsroot ], 5. Check apache server /etc/rc.d/init.d/httpd start

76 CVSweb setting 6. Check the web 7. Have fun

77 CVSmail setting 1. Refer to README of cvsmail. 2. Modify loginfo file to add user s addresses. DEFAULT $CVSROOT/CVSROOT/loginfo.rb $CVSROOT $USER %s skies@ntut.edu.tw 3. Modify notify file for sending . ALL mail %s s CVS notification 4. Modify config file for lock file location. LockDir = /var/lock/cvs

78 CVSmail setting 5. Modify acl file for access control. # Define a group named "admin" which "john" and "peter" belong to. group:admin:liao,yrwang,ppsm,jjosm,sexmonster,leon # A group name followed by "@" can be specified in the list of users. group:staff:@admin,qtk,yjh,leon,sexmonster,undead,bombom,cctang,wende # Grant "admin" members everything grant:@admin:.* # Only staffs can commit on "www" module grant:@staff:hmmx MAT4500 TCC300 Transcriber MCDC DialogX SpeakerX