Using Subversion with LeMANS and MONACO

Transcription

1 Using with LeMANS and MONACO Timothy R. Deschenes and Alexandre Martin Department of Aerospace Engineering, University of Michigan September 15, 2008

2 Outline 1

3 Why Use Version Control Provides one method for an entire team to use; everybody operates under the same ground rules Make changes available to others in the group; improves collaboration Changes are oderly, saves development time Ability to track changes promotes accountability and makes it easier to solve problems. List of exact changes made can be generated quickly and easily. Ability to automatically back up code Easy to roll back to an earlier version institution-log

4 ITCS NGPD group has dedicated space on ITCS Can access using ssh protocol Automatic daily backups held for a week Automatic weekly backups held for six months

5 Initial Setup

6 Initial Checkout (svn checkout)

7 Initial Checkout (svn checkout)

8 Branch Creation (svn cp)

9 Branch Created

10 Updating Working Copy (svn update)

11 Commit Changes (svn commit)

12 Commited (svn commit)

13 Merging from another branch (svn merge)

14 Merged Trunk to Branch

15 Commiting Changes from Merge (svn commit)

16 Commiting Changes from Merge (svn commit)

17 Changes Committed to Repository (svn commit)

18 Checkout Checkout a working copy svn checkout svn+ssh://uniquename@login.itd.umich.edu\ /afs/umich.edu/group/acadaff/ngpd/svn-repos/svnlemans/lemans \ SVNlemans cd SVNlemans

19 Getting Information from Server Update a working copy from server svn update Updates to most recent version in repository svn update -r 1234 Updates to revision #1234 svn update -r 1000 foo.c Updates just foo.c to revision 1000

20 Getting Info (cont d) Updating Working Copy from Another Branch/Trunk svn merge You specify where to get the information Used to update one branches changes on another Also way to reintegrate your branch into the trunk Make sure you specify correct directory Similar syntax to update except you must specify server

21 Getting Info (cont d) Update/merge output U foo.c A foo.c D foo.c R foo.c File foo.c was (U)pdated (received changes from server) File foo.c was (A)dded to your working copy File foo.c was (D)eleted from your working copy File foo.c was (R)eplaced in your working copy (ie: that file was previously deleted, then added back to the repository)

22 Getting info (cont d) Update/merge output G foo.c C foo.c File foo.c was mer(g)ed from your changed copy and the repository s copy File foo.c was in (C)onflict with the repository. You have edited the same lines as someone else. A person must examine the files and decide which changes to implement (or blend the two together).

23 Conflict Resolution svn puts temporary files of each different file that must be examined by the person Pick which changes to keep and put in working copy file Use svn resolve foo.c and svn will delete temp files and keep whatever you put in foo.c Can also use svn revert to toss out all changes

24 Making Changes Edit files Use favorite text editor, package manager, etc Add Files to Working Copy svn add foo.c Can also add directories (automatically recursive for directories) Delete files svn rm foo.c (no need to delete file first) Rename files svn mv foo.c foo.old.c Copy Files or Directories svn cp foo.c foo.old.c (automatically recursive for directories) institution-log

25 Examining Changes output svn status Can see more information with -v Can see even more information with -u (but requires network access) institution-log

26 Examining Changes svn diff Used to show differences in files svn diff -r 3 foo.c Show differences between current foo.c and revision 3 version svn revert Undo changes (revert back to last update) Commit changes svn commit -m Log Message Updates the repository to match local working copy

27 Examining Past Changes Log Message Make sure log messages describe the changes made svn log Easy for other users to examine past evolution shows past log messages that have been processed in your branch -r 5:19 limit range of log messages printed Can also see the log for a particular file Only shows log for revisions changed that particular file

28 Further Reference () home Book MONACO repository location on AFS /afs/umich.edu/group/acadaff/ngpd/svn-repos/svnmonaco LeMANS repository location on AFS /afs/umich.edu/group/acadaff/ngpd/svn-repos/svnlemans ITCS login address login.itd.umich.edu institution-log