version control system - svn

27
Version Control System (Sub)Version Control (SVN)

Upload: hironbose

Post on 17-Aug-2015

221 views

Category:

Documents


0 download

DESCRIPTION

How to use Tortoise version tool

TRANSCRIPT

Version Control System(Sub)Version Control (SVN)SVN LoginYour ID/Password are the same as your accessID(!"#$) Your ID will show u% with e&ery commit you ma'e( so ma'e sure that your %rogram com%iles be)ore you submit* I) someone else submits something with your ID( Y+, are res%onsible-So %rotect your ID )rom others*SVN client . /ortoiseSVN0+%en source a%%lication 1 download it )rom1htt%2//tortoises&n*net/downloads03)ter the installation a newo%tion a%%ears in the menu when you right clic' on a )older4/his is )or your home com%uter( the lab com%uters ha&e it already*5ow to chec'out06ight clic' in the )older you want to chec' out into0Select SVN Chec'out75ow to chec'out0,6L o) re%ository2 htt%2//s&n*cs*wayne*edu/s&n/csc$!!!w!!/5ow to chec'out08nter the user name and %assword21Your accessID (!"#$) and the same %assword you use )or Pi%eline/9lac'board5ow to chec'out0Select the %ro:ect you want to download2;or this assignment we are using the t changed them*/ortoiseSVN can merge some )iles on its own( but may tell you there are con)licts with others*I) a )ile has a con)lict use di))*5ow to u%date6ight clic' on the )ile( )older or %ro:ect you want to u%date and choose SVN ,%dateCommit+nce you ha&e added( deleted( or changed )iles or directories( you can then commit those changes to the re%ository*9e)ore committing you should always u%date*/he sa)est way to commit( is to di)) your %ro:ect be)ore you commit*3lways chec' your %ro:ect out a)ter a commit and ma'e sure it com%iles*Commit Comments3ll commits need to be commented*I) you )orget to comment( ma'e a tri&ial change to a )ile and commit adding in your comment that it a%%lies to the %re&ious commit*Include2Your Name/he ty%e o) commit (Change( 9ug ;i( 7)?hat the commit does (3dds /ool/i% dialog 7)3ny other im%ortant detailsDon>t include2/he names o) the )iles (/he log will ha&e them)/he date or time5ow to commit6ight clic' on the )ile( )older or %ro:ect you want to u%date and choose SVN Commit75ow to Di))06ight clic' on the )ile you want to di))*0Select Di))( this will com%are your )ile to the most recent (5ead) &ersion on the re%ository* In a new windowDi)) . 5ow to sol&e con)licts0I) :ust a word changed( it will be in red on one side yellow on the otherYou can use the green arrows to na&igate through the di))erences*Di)) . 5ow to sol&e con)licts0I) lines were added/deleted one side will ha&e gray the other yellow*/he 8dit menu has o%tions to hel% you combine the )iles*;inding who changed who to blame/his )eature isn>t only to