TortoiseSVN - User manual
Contents
1. Use text block From mine before theirs Use text block From theirs before mine v y 4 b 4 b Merged README txt r Al oo Unresolved gt Conflict y 4 a For Help press F1 Left View 1f 1 Right view 1 1 Confictss2 2 19 e The Use this text block option will use the change done by you and will override the changes made in the previous revision e The Use this while file option will override all the changes made in the previous revision The changes made by you will be final e The Use text block from mine before theirs option will append the two text snippets with your changes preceding the other set of changes e The Use text block from theirs before mine option will append the two text snippets with the other changes preceding the changes done by you After choosing appropriate conflict resolving method exit from the conflict resolve window Right click on the file filename ext Select Tortoise SVN gt Resolved The filename ext r files will get deleted Right click on the file filename ext Select TortoiseSVN gt Commit 10 Enter a log message 11 Click OK 12 The red exclamation overlay on the conflicting file will convert to a green tick mark overlay OND Viewing Differences between working copy and the repository 20 If a file is modified in working copy but SVN Commit is not done then to view its differences with the file in2. X Delete Badd to archive Q Get lock Add to meeting_4_3rd_oct rar TP branche Compress and email ar jtag Compress to meeting _4_3rd_oct rar and email 9 Switch Y Merge Send To gt C Blame Cut s Copy 3 create patch Create Shortcut Properties Delete Help Rename RE Settings Properties ma About 3 Ifyou select Head revision Click OK 4 Else If you select Revision enter the revision number viewable from the show log button into the input box Click OK 17 Conflict Resolution when same file is being modified by two or more users simultaneously During updates conflict may arise that prevent TortoiseSVN from updating the repository This type of situation occurs when two or more users have modified the same file in their corresponding working copies After one of them has taken the SVN Commit action when the other one tries to do a SVN Commit the following window of conflicting state appears TC ASYAWroject iReports meeting i_ifth_sep doc TortoieS N Upd E oli Action Path Hime type onfiched CSN Projed 1Repartsimeing_i_ 1 2th_saep doc Complehed At revision 74 Waning One o more fles are in a conflicted state Corflicted i cae When such a conflict arise for a file 3 additional files are created namely filename ext mine filename ext rOLDREVand filename ext rNEWREV 1 A red exclamation overlay will appear on the file 2 Right click
3. 4A Revision graph compress to project rar and email amp Resolved Scan project a x i Update to revision Microsoft Winamp Scan with AVG Free e Outlook Revert anal Scan for Viruses Ff Clean up i Send To gt Q Get lock Aa Release lock Adobe Reader YouTube _ ga ct A0 Downloader E Copy P Branchjtag Paste E Switch Create Shortcut Y Merge Delete FW Export Rename A Relocate Properties Add 2 Create patch la F E Apply patch Xss x i amp Properties 4 s l He o _ Help 2 i gt oe ae Mozilla Firefox PhotoPerfect AW Settings a a c O About Tas e A gt QHT ot Repository A repository is a place where data is stored and maintained Usually it is stored on the main server which contains data of all the projects A client user requires to access the repository to perform various actions like add modify delete etc with the contents of their respective project Working Copy To use this Subversion client or any other subversion client we first need a local copy in our system of the repository contents This local copy is also known as the Working copy This is where we make all modifications and then send these changes to the repository Downloading a Repository to a Working Copy SVN Checkout 1 Create a folder in your system where you want to download checkout th
4. Cases doc modified normal E patch patch non versioned 2 MV Show unversioned files l Show unmodified files Lowest revision 2 Highest revision 15 Check repository 3 When using this option for a folder the window that opens displays all the files that were modified since the last commit In case of a file it just gives the information about the user who made the changes Settings To set your Subversion specific settings use the Settings option 1 Right click any where on your system 2 Select the TortoiseSVN gt Settings option 3 You can decide on the look and feel network external programs and saved data from here After setting the choosing the required options click OK 31 Revision Graph This command analyses the revision history and attempts to create a tree showing the points at which copies were taken and when branches tags were deleted 1 Right click on the file folder 2 Select the TortoiseSVN gt Revision Graph option 3 The revision graph window displays the number of versions the file folder has been through Revision Graph File View Revision 6 7 rae Project Ranorts2 Revision 66 Revision 66 dalo Project Ranarts meeting_ d yd octa rae roct Rents Revision 65 Prati ajectilanarisvmesting d ad octa EP Revision 35 EP Revision 35 rate Patera ject lt im Showing 6 nodes Showing graph for CAS A Project 1 Reportsimeeting_4_Srd_olfeyision Graph r Sta
5. Create Shortcut Delete Rename Properties jog Messages meeti a 4y 10 36 AM 5 The TortoiseSVN Add box will be displayed which will confirm the file that is to be added Click OK 6 The TortoiseSVN Add Finished box will be displayed with a success message Click OK A blue plus overlay appears on the added file folder 8 To send this change from the working copy to the repository you need to perform a Commit operation Right click on the file meeting _7_21 oct doc 10 Reports File Edit view Favorites Tools Help Qui QF Aa rs XID H Address CASN Project 1 Reports meetings Microsoft Word Document 24 KE meeting 3 24th_sep Microsoft Word Document 42 KE 5 testi Microsoft Word Document 24 KE weeklyrepork week doc r 1 R71 File 26 KB z i meeting Ha Microsoft Word Document mE 24 KB meeting11 Microsoft Word Document 11 K meeting Srd_oct Microsoft Word Document 39 KE weekly report 11 KE weeklvreport Weeks doc R96 File 30 KE g f 9 Select the option SVN Commit 10 Enter a log message 11 Click OK Microsoft Word Documenti Scan weekly report dac meeting Microsoft Word Document 24 KB meeting 2 1st sep Microsoft Word Document 42 KE meeting i_ivth_sep Microsoft Word Document 42 KE a weeklyreport_week
6. That means the Subversion Status is normal G As soon as you start editing a file the status changes to modified and the icon overlay then Change to a red exclamation mark That way you can easily see which files were changed since you last updated your working copy and need to be committed If during an update a conflict occurs then the icon changes to a yellow exclamation mark If you have set the svn needs lock property on a file Subversion makes that file read only until You get a lock on that file Read only files have this overlay to indicate that you have to get a lock first before you can edit that file If you hold a lock on a file and the Subversion status is normal this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file This icon shows you that some files or folders inside the current folder have been scheduled to be deleted from version control or a file under version control is missing in a folder The plus sign tells you that a file or folder has been scheduled to be added to version control Unlike TortoiseCVS the CVS shell integration no overlay icon for unversioned files is shown We do this because the number of icon overlays are limited system wide and should be used economically Modify contents in the Subversion repository Make the required modifications in the file folder of your working copy A red exclamation o
7. Message window will display the various log messages entered for a file folder Lop Messapes meeting _i_1 th_sep doc Seles From LA OOF w To iif 7 2007 a Fa Reveion 6Acbone Author Data Message 3 2 CSSA admin 3 39 42 PM Wednesday November 07 2007 Action Path Copyfrempsth Revision E Hes unrelated changed paths 7s nie 16 Getting the contents of an earlier revision If you want to view the contents of an earlier repository revision you can do that by using the Update to revision option It gives two sub options namely A Head revision Updates the working copy with the current repository data B Revision Updates the working copy with the repository data of an older version Note The list of older revisions can be viewed with the help of show log button present in the dialogue box 1 Right click on the file folder 2 Select TortoiseSVN gt Update to Revision File Edit View Favorites Tools Help ae Back QJ wi Search a Folders iea Address EQ C S N Project 1 Reports v Go wW gt meeting_3_24th_sep wW gt meeting_i_17th_sep SN Microsoft Word Document Microsoft Word Document Lau 42 KB 42 KB wW SWmeeting_4 3rd_oct Open icrosoft Word Balaaa New 39 KB Print Scan meeting_4_3rd_oct doc Scan with AVG Free i ai A Repo browser Scan for Viruses Ss Check for modifications Open With j 4A Revision graph IC SVN Update SYN Commit 2 Rename aTortoiseSN
8. TortoiseSVN A Subversion client for Windows Version 1 4 5 Installing TortoiseSVN Click here to download the latest version of the Installer of 32bit TortoiseSVN Or Copy paste the following link to your web browser http tortoisesvn net downloads Once you have downloaded the TortoiseSVN client you need to install this client on your system Here are the steps to install TortoiseSVN client e Locate the path where you have downloaded TortoiseSVN installer e After the installation from the msi file you can start using TortoiseSVN But a restart is recommended TortoiseSVN User Guide Let us now learn to execute some basic Subversion features using TortoiseSVN Once you install TortoiseSVN you will find new options added to the Windows right click popup menu The actions associated with TortoiseSVN will be available at the right click as shown below a Vp aie Pie My Documents QuickTime va Playe 4 gt o My Computer VLC media player Open r Explore 1 ea Search ba z Add to Winamp s Bookmark list My Network Yahoo En in Wi i amas around queue in Winamp Places Messenger ar Play in Winamp F d Sharing and Security Recycle pit mame uortcu i SVN Update daii IA SVN Commit H f a Tortoisesvn P amp Show log S7 Badd to archive A Repo browser Internet itiverter Badd to project rar a Check for modifications Say compress and email
9. URL revision range i selectable in the above log dialogi svi fibrown usc edu 3690 coce Fall Projest i trunk HEAD Revision Revision The result of the merge is stored in the working copy at CASVNiProject 1 Reportsinesting_4_3rd_orck doc which point bo the repository at URL senc joron usc ecu 3690 code P als Project Reports meeting 4 Sed _oct dioe mere rv J oe __ ued cet cance Jt Enter the complete URL of the file folder that contains the changes that you want to merge source Enter the complete URL of the file folder to which the changes must be merged Click Merge button As an optional step you can choose to click the Dry Run button which will perform the merge operation but will not modify the working copy It displays the list of the files that will be changed when you choose to merge and notes those areas where conflicts will occur You can also view the diff in the unified diff format by clicking Unified Diff button The TortoiseSVN Merge Finished dialogue must be displayed with message that the destination file folder was updated with the required changes Click OK Right click on the destination file folder Select the TortoiseSVN gt Commit option Enter a log message Click OK 21 Get Lock If you get a Lock on a file then only you can commit that file Commits by all other users will be blocked until you release the lo
10. ch Folders Fea ses gt co na Paa gy meeting_2_21skt_sep File and Folder Tasks R l 2e Microsoft Word Document 42 KE mij Rename this file T Move this File Copy this File Print g Publish this File to the Web ary Scan meeting_i_17th_sep dac T Ia EEn a a F E G E mail this File ES ae Scan with AVG Free iy Print this file 42 KB r Scan For Viruses 4 Delete this File Open With SWM Update Other Places amp FSVN Commit AW Tortoises i Project 1 My Documents S Add to archive Shared Documents Add to meeting_i_17th_sep rar Compress and email A My Computer Compress to meeting_i_17th_sep rar and email a4 My Network Places Send To uk Copy Details Create Shortcut Delete Rename Reports m dr Properties LJ vy 10 26 AM 3 Click OK Icon Overlays db TF ga 1 a A ColumnProvider cpp ContextMenu cpp deregister registry d A a E Guids h TconOverlay qpp ItemIDList cpp ItemIDList cpp h j A PIDL h PreserveChdir qpp register registry RemoteCacheLink cpp Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons TortoiseSVN adds a so called overlay icon to each file icon which overlaps the original file icon Depending on the Subversion status of the file the overlay icon is different A fresh checked out working copy has a green checkmark as overlay
11. ck A locked file cannot be modified in any way in the repository so it cannot be deleted or renamed either except by the lock owner iF 2 3 Right click on the file folder on which you want to acquire the lock Select the TortoiseSVN gt Get Lock option In the TortoiseSVN Lock files dialogue enter a reason about why you need the lock on this file folder Click OK NOTE When you wish to lock a folder TortoiseSVN gives you the option to choose the files that exists within this folder you can select the files that you wish to lock Once the file folder is locked for edit by other users the Lock Finished dialogue will be displayed with a success message Click OK A yellow lock overlay appears on the locked file folder Release Lock The lock owner can release the lock from a previously locked file Once the lock has been released any other user can modify the file Pe ee A yellow lock overlay appears on the locked file folder Right click on the locked file folder for which you want to release the lock Select the TortoiseSVN gt Release Lock option Once the file folder is unlocked the Unlock Finished dialogue will be displayed with a success message Click OK The yellow lock overlay on the locked file folder will convert to a green tick mark overlay 28 Export When you create a working copy of a repository some svn directories are formed Sometimes you may want a working copy without any o
12. e repository contents 2 Move your mouse to point at this folder and do a right click 3 Select the SVN Checkout option oie Explore Search Add bo Winamp s Bookmark list Enqueus in Winamp Play in Winamp Shaving and Security StH Checkout orthoses S Add to archive S Add bo Project irar Compress and ema 33 Compress bo Project 1ra ard email hacan Project 1 Scan wth AWS Free Scan For Viruses Send To H Cut Copy Oraste Shortcut Orlete Aenranme Properties 4 A dialogue box as shown below opens up Repository LRL of repository a wn Er cmi Lec ea S60 e Checkout dinechory CASYMiProject 1 Qnky check out the top Folder Orit estennals Reyvgion OF HEAD revision 3 Revision This dialogue box requires you to enter the following details e URL of repository Enter the repository URL here svn brown usc edu 3690 cs577a08 Team lt gt where Team lt gt is the team number Note the space between Team and lt gt For example URL for team 1 is svn brown usc edu 3690 cs577a08 Team 1 5 Authorization Authentication asyn brown weceducS690 gt Hy First Pepoesiboary Fegussts a usename and 4 password Username Passer Save authentication 6 Enter your username and password in the authentication window and click ok Check the Save authentication box to avoid repetitive authorization 7 Once username a
13. f those svn directories For this purpose TortoiseSVN offers the command Export to avoid making a copy and then delete all those svn directories manually l 3 Right click on the folder that you wish to export Select the TortoiseSVN gt Export option Select the location where you wish to export the folder contents in the Browse for Folder dialogue You can choose an existing location or create a new folder using the Make new folder button After selecting the location click OK After the folder is exported successfully the TortoiseS VN dialogue is displayed with success message Click OK Relocate To make the working copy point to a new repository you can use the Relocate option eae ode a Right click on the top level folder in the working copy Select the TortoiseSVN gt Relocate option Enter the URL to which you need to relocate to click OK After the working copy is relocated successfully the TortoiseS VN dialogue is displayed with success message Click OK Clean Up If your working copy gives a working copy locked error and becomes unusable you must use this command to make the working copy usable again l 2 oF Right click on the folder on which you want to perform the Clean up activity Select the TortoiseSVN gt Clean Up option Once the clean up is done the Clean Up has Finished dialogue will be displayed with a success message Click OK 29 Reposit
14. icrosoft Word Document 42 KB E 42KB Open q y weeklyreport weeks zi Microsoft Word Document 29 KB neetingi_17th_sep Wicrosofk Word Document Mew Print fp E Scan meeting _i_17th_sep doc Su Show Scan with Avg Free a G Repo browser Scan For viruses As Check For modifications Open With Ek Revision graph i SVN Update E Update to revision FF SVN Commit EEA AOE A aa Delete Add to archive G Get lock Add to meeting_i_17th_sep rar m 3 Compress and email Branchjtag Compress to meeting_i_17th_sep rar and email m Switch Y Merge Send To k n Blame Cut Copy 2 Create patch Create Shortcut m Properties E Delete Help Rename HE Settings Properties aw About Mew name A red exclamation overlay will appear on the renamed file folder s parent folder Navigate to the parent folder and right click on it Select the option SVN Commit Enter a log message Click OK The red exclamation overlay from the parent folder will convert to a green tick mark overlay ee a 13 Revert Changes If you wish to remove all changes made to the working copy that have been added but not committed you can use the revert operation This will undo all changes made to a file since the last commit So eS Make a few changes to the contents of a file A red exclama
15. il Micro ia Tortoise_SVN Micros tay Documenti Microsof Explanation for the Screenshot In the working copy the text None was deleted from the ISSUES PROBLEMS topic in the weekly meetings file but it existed in the repositories copy of the same file Hence the diff command highlights the point from where the text was deleted and in a block mentions the difference 1 e Deleted None 22 Getting Help To get help for using any of the Subversion commands using TortoiseSVN 1 Right click anywhere on your Windows System 2 Select TortoiseSVN gt Help Fle Edt View Favorites Took Help J Gp back T J Si Search 5 Folders E Address lj C SiiPraject 1 Reports Go z h eal ei ittie aii d E a i m meeting 24th_sep A meeting_i_ifth_sep SVT Microsoft wond Document Microsoft sored Documert a 2 KE 42 KE a Pricros k pe i 4 meing e elst erp Hew S Microsott Word Documerni Print 42 KB Scen mesting_ _Srd_oct doe Scan with AAG Free Ge Show log Gh Repo browser Scan for Viruses Bs Check for modifications Open Win i E Revison graph i Sh Update P WH Commit Update to revihon P Rename Delete Add to archive Get lock Badd to weeting_4_Sed_octorar l SB Compress and email La Eranthis 7 Compress to meeting 4 3rd ohra and email FEL Swich Y Merge Send Ta k ZL Blame Cut irk Copy be Creebe patch Creste Shortcut Se Pr
16. nd password are authenticated the repository files will be checked out into the working copy and a window like the one below will appear and then click ok svn brown usc edu 3690 code Fall0 Project TortoiseSVN Checko Action Path Added C Documents and SettingsigauraviDesktopipiSource Codeitsti kzt Added C Documents and SettingsigauraviDesktopipikeports Added C Documents and Settings qauray Desktop piReports weeklyreport week doc Added C Documents and SettingsigauraviDesktopipikeportsimeeting_3_z4th_sep doc Added C Documents and SettingsigauraviDeskktopipikeportsimeeting doc Added C Documents and SetktingsigauraviDeskkopipikeports imeeting_4_3rd_oct doc Added C Documents and SettingsigauraviDesktopipikeportsimeeting_z_zist_sep dor Added C Documents and SettingsigauravDesktopipikeports meeting_i_17zth_sep doc Added C Documents and SettingsigauraviDesktopipiTest Cases Completed At revision 77 lt il 4dded 16 8 When you open the working copy folder you will see icons with a green tick mark sign If you encounter any other sign you can refer them by icon overlays mentioned in the end Update the Working Copy To update the working copy with the latest repository modification we use the SVN Update command It merges changes in repository with the working copy 1 Right click on the folder file 2 Select SVN Update Reports Fie Edit View Favorites Tools Help a sak bi wa DO sear
17. on the file filename ext 3 Select TortoiseSVN gt Edit Conflicts 18 File Edit View Favorites Tools Help ae sack i gt P Search Folders lay rs x ie E Address gt E P i es meeting 3 24th _sep E meeting Srd_ock Microsoft Word Document ma Microsoft Word Document 42 KE Diff Open Se Show log New GL Repo browser Print H ae o a Check for modifications amp Scan meeting i_17th_sep doc o meeting_i_17th_sep doc Scan with AYG Free A Revision graph R65 File 42 KB 8 Edit conflicts Open With b amp y Resolved Scan For Viruses Update to revision i SVN Update ASN Commit alee p a X Delete EEE 1 Revert Add to archive Get lock FS Add to meeting_i_i7th_sep rar Compress and email T Branch tag Compress to meeting_i_17th_sep rar and email E Switch ig Merge Send To bl ETE g Blame fut Copy i Create patch Create Shortcut Properties Delete 4 Help Penang HE Settings start kic Properties About LJ 4y 11 51 AM 4 Resolve Conflict The TortoiseMerge window displays two conflicting versions of the files One has changes made by you and the other is the version of the file currently residing in the repository Right click on the changes made by you 51x File Edit View Merge Help gt B IATa 4 a E Use this text black Use this whole file
18. operties Delete Renan Hep WE Settings 2 indice Properties w bout Creating a Branch Branching is the ability to isolate changes onto a separate line of development This line is known as a branch Branches are often used to try out new features without disturbing the main line of development with compiler errors and bugs This is useful when working out a big change that needs to be coordinated in a team or when using a single working copy for the work with the change 1 Right click on the file folder that you wish to branch 2 Select the TortoiseSVN gt Branch Tag option 3 In the Copy Branch tag dialogue enter the To URL as svn brown usc edu 3690 code Fall07 Project lt projectnumber gt branches filename where projectnumber is the number of your project team 4 In the Create copy in the repository from section select the revision number of the file folder from which you want to branch e HEAD revision in the repository Select the option if you want to create the branch from the head revision e Specific revision in repository Select this option if you want to create the branch from a specific revision e Working Copy Select this option if you want to create the branch from the working copy revision 23 5 Enter a log message and click OK Copy Branch Tag Repository From vil ak URL fbrown usc edu 3690 code Fall0 Project1 Reports weeklyreport_week doc To URL Create co
19. ory Browser The Repository Browser allows you to view the structure and status of the repository Right click on the file folder Select the TortoiseSVN gt Repo browser Ne 3 The repository browser must open which displays the directory structure of the working copy lt Repository Browser URL syni brown usc edu 3690 code Fall0 Project 1 Revision HEAD File Extension Fl G syne fibrownusec edu 3690 code g Fallo p Projecti O Design Reports meeting doc fe meeting 21st _sep doc meeting 3 24th sep doc cal meeting 4 Srd_oct doc meeting i 1 th sep doc cal meetingl doc meetingz dor fe meetingl 1 doc best doc fe weeklyrepork weeks doc C Source Code Hint Press FS to refresh the selecked subtree and Ctrl F5 to load all children too Aukhor C5590711 Admin dick dick dick 559071 Admin 559071 Admin dick dick dick dick dick pahuja pahuja 30 Check for modifications It is similar to the diff command and tells you about the modifications that have taken place in the file folder in the working copy compared to the file in the repository 1 Right click on the file folder 2 Select the TortoiseSVN gt Check for Modifications TortoiseS N Working Copy C Foobar Project Contents Text status Property status Remote text status Remote property status Lock comme 3 README deleted BF trunk docs TestCases xls added WH trunk docs Use
20. py in the repository From G HEAD revision in the repository CO Specific revision in repository O Working copy Log message Recent messages Create a branch O Switch working copy to ne 6 A success message is displayed once branch is created successfully Click OK Creating a Tag Tagging is the ability to mark particular revisions e g a release version so you can at any time recreate a certain build or environment p Right click on the file folder that you wish to tag Select the TortoiseSVN gt Branch Tag option In the Copy Branch tag dialogue enter the To URL as svn brown usc edu 3690 code Fall07 Project lt projectnumber gt tags filename where projectnumber is the number of your project team In the Create copy in the repository from section select the revision number of the file folder from which you want to tag HEAD revision in the repository Select the option if you want to create the tag from the head revision 24 e Specific revision in repository Select this option if you want to create the tag from a specific revision e Working Copy Select this option if you want to create the tag from the working copy revision 5 Enter a log message and click OK Copy Branch Tag Repository From Vwi at URL fbrown usc edu 3690 code Fall07 Projecti Reports weeklyreport_week6 doc To URL syni brown usc edu 3690 code Fall0y Projecti fhags weeklyreport_we Create co
21. py in the repository Fromm HEAD revision in the repository C Specific revision in repository Working copy Log message Recent messages Create a tag E Switch working copy bo new pench 6 A success message is displayed once tag is created successfully Click OK 25 Switching between branches The switch command transfers only the changed data of the repository to your working copy Switch works just like Update in that it never discards your local changes Any changes you have made to your working copy which have not yet been committed will be merged when you use the Switch option 1 Right click on the file folder to which you want to apply the changes 2 Select the TortoiseSVN gt Switch option P switch Ta Branch f Tag Poet ier G HEAD revision Revisi n 3 Enter the URL of the file in the repository from where you want to bring in changes 4 Choose the appropriate revision 5 Click OK Merge Merge applies the differences between two sources to a working copy path 1 Right click on the file folder in which you want to merge the changes 2 Select the TortoiseSVN gt Merge option 26 0 9 4 0 Speory the revision range which you wank bo merge From start LAL and revision of the range bo merge sun browns edu 3690 code Fal 07 Project 1 Brandes 3 READ Revision Revision Ignore ancestry To fend URL and revision of the range bo merge Use From
22. rt fan 2 Windows Explorer EJ 2 Microsoft Word 7 F Revision Graph i J i Sy 11 02 AM About 1 Right click any where on your system 2 Select the TortoiseSVN gt About option 3 Information on the installed version of TortoiseSVN must be displayed Click OK 32 Important points to remember You may find that not all of these icons are used on your system This is because the number of overlays allowed by Windows is limited to 15 Windows uses 4 of those and the remaining 11 can be used by other applications Normal Modified and Conflicted are always loaded and visible Deleted is loaded if possible but falls back to Modified if there are not enough slots Read only is loaded if possible but falls back to Normal if there are not enough slots Locked is only loaded if there are fewer than 13 overlays already loaded It falls back to Normal If there are not enough slots Added is only loaded if there are fewer than 14 overlays already loaded It falls back to Modified if there are not enough slots 33
23. s Microsoft Word Cocurie rga Microsoft Word Document Print 29 KB Scan meeting _i_ivth_sep doc p m i Scan with Avia Free pce Repo browser Scan for Viruses AS Check For modifications ual on d 42 Revision graph i SVN Update Update to revision oe Commit a cerns pe Tortoises vi aes Add to archive 2 Get lock 2 Add to meeting_i_i7th_sep rar oa 32 Compress and email ou ltag Compress to meeting_i_17th_sep rar and email PB Switch Y Merge Send To k Blame fut Copy 3 Create patch Create Shortcut i tae Properties Delete 9 Help las HE Settings Properties re About Navigate to the parent folder and right click on it Select the option SVN Commit Enter a message Click OK The red exclamation overlay from the parent folder will convert to a green tick mark overlay 4 3 6 7 8 12 Rename a file folder 1 Right click on the file folder that you want to rename 2 Select the TortoiseSVN gt Rename l EX File Edit View Favorites Tools Help a Back gt i pi Search lear Folders EBk Address C S NiProject 1 Reports 3 0 eA meeting_2_z21st_sep oT meeting 3 24th _sep svn Microsoft Word Document Ha M
24. s ma Microsoft Word Document Open Mew Print Scan with AYG Free Scan For viruses Open With SYN Commit Tortoises vN Add to archive S Add to weekly reportrar Compress and email Compress to weekly report rar and email Send To l uk Copy Create Shorkcut Delete Rename Dramnarkiar 12 The blue plus overlay on the added file folder will turn to green tick mark NOTE The steps to add file or a folder or a folder tree are exactly the same When you add a folder tree it s enough you perform the above steps on the parent folder The sub folders and files present in this folder are added and committed together with the parent 1 Delete a file folder 1 Right click on the file folder that you want to delete 2 Select TortoiseSVN gt Delete 3 A red exclamation overlay will appear on the deleted file folder s parent folder Fie Edit View Favorites Tools Help ae Back gt a pe Search Wey Folders Address CASYN Project 1 Reports ed ce eA meeting 2 1st_sep 2 T meeting 3 24th sep r Oos Microsoft Word Document E Microsoft Word Document a 42 KE mE 42KB neeting_i_17th_sep Open a weeklyreport_ week
25. the repository we use the diff command p lt A red exclamation overlay will appear on the modified file 2 Right click on the file in the working copy that you want to compare with the repository s copy 3 Select TortoiseSVN gt Diff Fie Edit View Favorites Tools Help A pack hi gt wi P Search gt Folders Es Bw xX w Address L C Documents and SettingsiadminDesktopishorteut to desktopidiReports Ed Go n meeting 2 21st sep oT meeting 3 24th sep Microsoft Word Document He Microsoft Word Document 42 KB SEE 42 KB Open ae eee Print Scan meeting 4 3rd_oct doc Scan with AVG Free amp Show log GL Repo browser Ba check for modifications Scan For Viruses Eh Revision graph Open With b E Update to revision i SYN Update A Rename ev Commit K Delete pe lortoises h i Gave Add to archive G Get lock 3 Add to meeting_4_3rd_oct rar 3S Compress and email TP Branchjtag 3S Compress to meeting_4_3rd_oct rar and email a Switch Y Merge Send To k i o Blame ut Copy 3 Create patch Create Shortcut i Ge Properties Delete Help m haieta Settings ts Start WS Properties a About Fd Fak Hy 1 22 PM 4 The file that has been modified in the
26. this WC SVN Export to here SVN Export all to here Copy Here Move Here Create Shortcuts Here Cancel Select one of the options SVN Move versioned files here Moves the file folder from one location to another without loosing its history SVN Copy versioned files here Copies the file folder from one location to another without loosing its history SVN Copy and rename versioned files here Copies and Renames the file folder from one location to another without loosing its history SVN Add files to this WC Adds the file folder as a new file to the Working copy SVN Export to here Exports the file folder to the repository SVN Export all to here Exports all the files and folders in the source directory to the repository Copy here Copies the file folder from source to destination as a new file Move here Moves the file folder from source to destination as a new file Create shortcuts here Create a shortcut in destination folder Cancel Copy Move operation is cancelled For copying select SVN Copy versioned files here Navigate to the parent folder and right click Right click on the file folder Select the TortoiseSVN gt Commit option Enter a log message Click OK 15 View Log You can view the various log messages entered for a particular file folder during commit operations 1 Right click on the file folder 2 Select TortoiseSVN gt Show Log 3 The Log
27. tion overlay will appear on the modified file folder Right click on the file folder of which you want to revert the changes Select the TortoiseSVN gt Revert The red exclamation overlay on the modified file will convert to a green tick mark overlay eeting_t_ i 7th_sep horgactt ond Dorunner 2 KE Copenh eA Pririt D Seen meeting i_i th_sep doe Scan wath AG Press Seen for viruses Open Wih i SUH Update P SVN Connie eTortobestN BB Add to achive Add to mesing _17th_ssp rar Compress and emal a2 Compress to meeting i 17th sapra and email Send To Cut Opry Creste Sharir Ddete Rename Properties Sh Diff ea Show iag G Repo browser AS Check for mocificatians A Revigion graph OP Update to revigion G Renae Delete G Get lock TP Branchitag E Switch Merge fi d Create patch y Properties Hel WE Settings WW About 14 Copy a file folder This command is used to copy a file folder from your working copy to your system l 2 oF SH OCHONAM 0 Right click on the file or folder that you wish to copy Without releasing the mouse button drag the file folder to its destination NOTE Use the right click to drag Drop the file folder at the destination folder and you d see a pop up menu like the following SVN Move versioned files here SVN Copy versioned Files here SVN Copy and rename versioned files here SVN Add files to
28. verlay will appear on the modified file folder Right click on the file that was modified Select the option SVN Commit Enter a message Click OK The red exclamation overlay on the modified file folder will convert to a green tick mark overlay oe eee Add a new file folder to Subversion repository In your working copy navigate to the folder where you want to add the new file folder Add a new file folder for example meeting _7_21 oct doc Right click on the file meeting 7_21 oct doc Select TortoiseSVN gt Add oe Fie Edit View Favorites Tools Help ae sack v gt P Search Folders EBk Address O CASN Project 1 Reporks k 0 i meeting 2 21st sep meeting 3 24th _sep Microsoft Word Document Microsoft Word Document 42 KE 42 KE meeting i_17th_sep a meeting 4 3rd_oct Microsoft Word Document H Microsoft Word Document 42 EB ee weeklyreport_week Microsoft Word Document 29 KE Open Mew neeting_ _21st_oct Wicrosort Word Documentos 11 KB Scan meeting_ _2Z1st_oct dac Scan with AVG Free Scan For Viruses Open with a Tortoises yh B Add to archive a 2 Add to meeting_ _21st_oct rar Add to ignore list P Compress and email Compress to meeting_ _21st_oct rar and email Help an AK Settings _ oe About Cut T Copy
29. working copy will open up with the differences between working copy and repositories copy mentioned 21 u Document Microsoft Word BER o File Edit Yiew Insert Format Tools Table Window Help Type a question for help X PEA FEW EAEN I EAEE Sm A G T 100 2 amp Normal TimesNewRoman 11 B Z U E fie O A Final Showing Markup Show er gt Up XP iQ ji gt 5 bh e O a e ee OR Gee wh Ph a 8 OE at a pe Jats 2 Installing tortoise SVN and creating a Repository at Server 3 Enabling and confirming repository access 4 Creating Subversion user accounts at server for write access 5 Authorizing user access controls at server 6 Creating different users and populating repository at user with initial content II ACTUALLY COMPLETED SINCE LAST WEEK 1 Installing svnserve as Windows server on local machine 2 Installing tortoise SVN and creating a Repository at Server 3 Enabling and confirming repository access 4 Creating Subversion user accounts at server for write access 5 Authorizing user access controls at server 6 Creating different users and populating repository at user with initial content IHI NEXT ACTITIVITIES 1 Planning user access nights policies 2 Testing client accessibility to server at different server machine IV ISSUES PROBLEMS _ Deleted None Sojas Page 1 Sec 1 1 at 4 2 Ln 13 Coli REC TRK EXT OVR English U S T USC Web Ma
Download Pdf Manuals
Related Search