A Short Introduction to Subversion

Transcription

1 1 / 36 A Short Introduction to Subversion Miaoqing Huang University of Arkansas

2 2 / 36 Outline 1

3 3 / 36 The Problem to Avoid

4 4 / 36 The Problem to Avoid

5 5 / 36 The Problem to Avoid

6 6 / 36 The Problem to Avoid

7 Share the Information through Repository All the members in the same team share the information through the central repository The Subversion repository remembers every change written to it You are not going to lose any data and information once you let Subversion manage your project Every successful modification to the repository increase the version by one The repository will keep the current version and all previous versions The copy at the client side is called local working copy Check in your modifications to the repository Check out the version in the repository to get the changes from other clients 7 / 36

8 8 / 36 The Big Picture

9 Two Categories of Operations (by client) Check In Submit the changes in local copy into the repository Two commands svn import: import your initial copy into the repository if there is no copy there svn commit: commit the changed in local working copy into the repository 9 / 36

10 Two Categories of Operations (by client) Check In Submit the changes in local copy into the repository Two commands svn import: import your initial copy into the repository if there is no copy there svn commit: commit the changed in local working copy into the repository 10 / 36

11 Two Categories of Operations (by client) Check Out Get the changes from the repository to the local working copy Two commands svn checkout: check out a copy in the repository as your local working copy svn update: update your local working copy to the current version in the repository 11 / 36

12 Two Categories of Operations (by client) Check Out Get the changes from the repository to the local working copy Two commands svn checkout: check out a copy in the repository as your local working copy svn update: update your local working copy to the current version in the repository 12 / 36

13 13 / 36 The Copy-Modify-Merge Method

14 14 / 36 The Copy-Modify-Merge Method

15 15 / 36 The Copy-Modify-Merge Method

16 16 / 36 The Copy-Modify-Merge Method

17 17 / 36 The Copy-Modify-Merge Method

18 18 / 36 The Copy-Modify-Merge Method

19 19 / 36 The Copy-Modify-Merge Method

20 20 / 36 The Copy-Modify-Merge Method

21 21 / 36 Basic Commands Initial import and checkout svn import, svn checkout Basic work cycle (once you have a local working copy) 1 Update your working copy svn update 2 Make changes Change existing files, svn add, svn delete, svn copy, svn move 3 Examine your changes svn status, svn diff 4 Possibly undo some changes svn revert 5 Resolve conflicts (merge others changes) svn update, svn resolve 6 Commit your changes svn commit

22 22 / 36 svn import svn import mytree svn+ssh://username@turing.uark.edu/var/svn/csce3513/sp11/username/mytree1 \ -m "some message" Copy an unversioned tree of files into a repository Example: copy directory mytree and its content into the repository under mytree1 Generally, used when you want to start tracking a new project that is parallel to your other working projects The unversioned copy is NOT a local working copy

23 23 / 36 svn checkout svn checkout svn+ssh://username@turing.uark.edu/var/svn/csce3513/sp11/teamxx Check out a repository and create a working copy on your local machine or local directory Example: check out your team project to your local directory, i.e., teamxx You can check out previous version of the repository svn checkout -r xx... If the version information is not given, the latest version is checked out Once you check out the repository, you no longer need to remember the long target address of the repository The svn client program is going to remember that for you

24 24 / 36 svn update svn update Bring your working copy into synchronization with the latest revision in the repository Generally, the first step you do before you resume your work

25 25 / 36 Change existing files Edit the existing files in your working copy using your favorite text editor Don t forget commit your changes after you finish. Otherwise, nobody else is going to see the changes you made to the files

26 26 / 36 svn add svn add foo Schedule file, directory or symbolic link foo to be added to the repository foo will be added into the repository in you next commit If foo is a directory, everything underneath foo will be scheduled for addition foo has to exist in your working copy before you schedule the addition

27 27 / 36 svn delete svn delete foo Schedule file, directory or symbolic link foo to be deleted from the repository foo will be deleted from the repository in you next commit If foo is a file or link, it is immediately deleted from your working copy If foo is a directory, it is scheduled for deletion Another way You manually use rm to delete the file or directory, then use svn delete to schedule the deletion in the repository

28 28 / 36 svn copy svn copy foo bar Create a new item bar as a duplicate of foo and automatically schedule bar for addition

29 29 / 36 svn move svn move foo bar Same as svn copy foo bar; svn delete foo Schedule bar for addition as a copy of foo, and foo is scheduled for removal

30 30 / 36 svn status svn status? scratch.c # file is not under version control A bloo.h # file is scheduled for addition C lump.c # file has conflicts from an update D fish.c # file is scheduled for deletion M bar.c # file has local modifications Get an overview of your changes, in the middle of your work or before you commit C item: the file item is in a state of conflict, which can not be resolved during the update. You must resolve it manually before committing your changes The changes from the server and your local changes modify the same statement, e.g., flag_c = xxx;

31 31 / 36 svn diff mqhuang@turing:~/svn/mqhuang$ svn diff Index: test2.c ============================================== --- test2.c (revision 13) +++ test2.c (working -1 -test1.c +test1.c is modified to +test2.c Examine the details of your local modifications Examine the details of different versions

32 32 / 36 svn revert mqhuang@turing:~/svn/mqhuang$ svn revert test2.c Reverted test2.c Revert a file to its pre-modified state by overwriting it with the cached copy from the.svn area It can undo any scheduled operations

33 33 / 36 svn commit svn commit -m "a short message" svn commit -F logmsg #logmsg is a file keeping long message Commit all your modifications and scheduled operations You have to provide a log message

34 34 / 36 svn log mqhuang@turing:~/svn/mqhuang$ svn log mqhuang@turing.uark.edu s password: r13 mqhuang :23: (Wed, 03 Feb 2010) 1 line add test2.c test3.c r12 mqhuang :21: (Wed, 03 Feb 2010) 1 line add test1.c r11 mqhuang :21: (Wed, 03 Feb 2010) 1 line delete test3.c Exam the repository history

35 35 / 36 What svn commit and svn update do? unchanged, current locally changed, current unchanged, out of date locally changed, out of date svn commit nothing publish your changes nothing fail svn update nothing nothing download the changes to your working copy try to merge the changes in the repository and your changes; if impossible, leave the user to solve Current The version of working copy = the version in the repository Out of date The version of working copy < the version in the repository

36 36 / 36 Demo A short live demonstration... If you have problem to access your svn account, please direct your to root@csce.uark.edu, including your name, your UARK ID