Subversion 101: A short introduction to Subversion
•Télécharger en tant que PPT, PDF•
1 j'aime•978 vues
The document provides an overview and introduction to using Subversion (SVN) for version control. It discusses basic SVN concepts like revisions, atomic commits, branching and tagging. It also covers installing and configuring an SVN server, common SVN commands like checkout, update, commit, add, delete, copy and move. It describes resolving conflicts during merges. The document is intended to teach SVN basics and help users get started with the version control system.
![Version Control:: Subversion 101 Nguyen Vu Hung [email_address] 2010/10/05 2010/10/05 Subversion 101 Nguyen Vu Hung](https://image.slidesharecdn.com/subversion-101-public-110106074153-phpapp02/85/Subversion-101-A-short-introduction-to-Subversion-1-320.jpg)
Recommandé
Contenu connexe
Tendances
En vedette
En vedette (20)
Similaire à Subversion 101: A short introduction to Subversion
Similaire à Subversion 101: A short introduction to Subversion (20)
Plus de Vu Hung Nguyen
Plus de Vu Hung Nguyen (20)
Dernier
Dernier (20)
Subversion 101: A short introduction to Subversion
- 1. Version Control:: Subversion 101 Nguyen Vu Hung [email_address] 2010/10/05 2010/10/05 Subversion 101 Nguyen Vu Hung
- 2. Change History 2010/10/05 Subversion 101 Nguyen Vu Hung No Author Date Slides Details 1 Vuhung 2010/10/04 All Newly created 2 Vuhung 2010/10/05 - - 3 Vuhung 2011/01/06 All Remove private info
- 8. Revision Control system 2010/10/05 Subversion 101 Nguyen Vu Hung As Atomic Changes Not just change, It is change management 0 1 2 3
- 10. Usages 2010/10/05 Subversion 101 Nguyen Vu Hung Backing up data Documentation Configuration Management Distributed Development CR 12
- 11. Architecture 2010/10/05 Subversion 101 Nguyen Vu Hung Berkley DB FSFS Subversion Repository Client Interface Repository Interface GUI client apps Commandline client apps Client Library Working Copy Management Library Repository access DAV SVN Local Apache mod _ dav mod_dav_svn svnserve Internet (Any TCP/IP Network) Offline Support Unix/Linux/Windows/Mac OS X WebDav Integration SSL LDAP
- 13. Installation (server) 2010/10/05 Subversion 101 Nguyen Vu Hung yum install mod_dav_svn subversion
- 14. Installation (server settings) 2010/10/05 Subversion 101 Nguyen Vu Hung [root@vinicorp conf]# cat /etc/httpd/conf.d/subversion.conf LoadModule dav_svn_module modules/mod_dav_svn.so LoadModule authz_svn_module modules/mod_authz_svn.so <Location /svn-repo > DAV svn SVNParentPath /svn-repo # Limit write permission to list of valid users. <LimitExcept GET PROPFIND OPTIONS REPORT> # Require SSL connection for password protection. # SSLRequireSSL AuthType Basic AuthName "Vinicorp Subversion Realm" AuthUserFile /etc/svn-auth-conf Require valid-user </LimitExcept>
- 15. Installation (server settings) 2010/10/05 Subversion 101 Nguyen Vu Hung [root@vinicorp conf]# head /etc/svn-auth-conf #vinicorp:pIuFZUS0McheY hoatran:3cYHbUvT9aV0o doancuong:0K3C3IdVJD7VY thuanvd:xJSWLpXNr5/EM hiennb:GHvHoKOG2E1eI huyenvtt:FySHeMI9u9uvc trungdq:MB7kxm/IgGMsY thuytp:rw68sUTpnVD7M thangnv:zSoOwCSdqqcLk phuongdt:o2ZYftrCjq2oM [root@vinicorp conf]# wc -l /etc/svn-auth-conf 51 /etc/svn-auth-conf
- 16. Installation (server settings) 2010/10/05 Subversion 101 Nguyen Vu Hung [root@conf]# head /etc/svn-auth-conf #xxxxxxxxxx:pIuFZUS0McheY xxxxxxxxxx:3cYHbUvT9aV0o xxxxxxxxxx:0K3C3IdVJD7VY xxxxxxxxxx:xJSWLpXNr5/EM xxxxxxxxxx:GHvHoKOG2E1eI xxxxxxxxxx:FySHeMI9u9uvc xxxxxxxxxx:MB7kxm/IgGMsY xxxxxxxxxx:rw68sUTpnVD7M xxxxxxxxxx:zSoOwCSdqqcLk xxxxxxxxxx:o2ZYftrCjq2oM [root@conf]# wc -l /etc/svn-auth-conf 51 /etc/svn-auth-conf Create a repo: mkdir /svn-repo Create an user : htpasswd -c /etc/svn-auth-conf vinicorp
- 17. Installation (server settings) 2010/10/05 Subversion 101 Nguyen Vu Hung [root@ svn-repo]# pwd /svn-repo [root@ svn-repo]# ls -1 001.Project1 005. Project2 006. Project3
- 18. Installation (server settings) 2010/10/05 Subversion 101 Nguyen Vu Hung [root@ svn-repo]# pwd /svn-repo [root@ svn-repo]# ls -1 001.Project1 005.Project2 006.Project3 cd /svn-repo svnadmin create 001.Project1 chown -R apache.apache 001.Project1 service httpd restart
- 25. Work flow 2010/10/05 Subversion 101 Nguyen Vu Hung svn checkout svn update get content svn add svn move svn delete Make changes svn status -u See what was changed in the repository in the meantime svn update Update your local copy svn diff svn resolved Merge your changes Resolve conflicts svn commit Submit your changes 105 100 106 Subversion Repository
- 26. Branching 2010/10/05 Subversion 101 Nguyen Vu Hung branches trunk PC Root iPhone PC branch (vuhung) branches trunk Easy to understand Cheap (a little copy) Can be deleted/reanimated
- 27. Branching (2) 2010/10/05 Subversion 101 Nguyen Vu Hung branches trunk 001.SPS Root HuyDN HungNT
- 29. Real World Example: Debian 2010/10/05 Subversion 101 Nguyen Vu Hung
- 47. Svn diff 2010/10/05 Subversion 101 Nguyen Vu Hung [vuhung@ 20100927]$ svn diff . Index: chuyen.lrc =================================================================== --- chuyen.lrc (revision 166) +++ chuyen.lrc (working copy) @@ -5,15 +5,15 @@ [00:15.83]chieu ngoai o, gio khe dua toc em [00:26.51]Cong cong con duong uon quanh. -[00:30.71]chieu dao pho, chieu mang chut huong thanh binh [00:46.72]Thuong anh yeu anh em uoc mo. -[01:01.23]Uoc mo nho be trong doi +[01:01.23]Uoc va mo nho be trong doi [01:16.11]UOc mo cho tinh yeu len hat sac xuan +[01:16.11]UOc mo cho tinh yeu len hat sac xuan [01:21.19]Uoc mo la la tren canh [01:27.07]Nguoc mat thay bao giac mo. @@ -44,4 +44,4 @@ [03:53.07]??c m? nh? be trong ??i [03:58.84]Ng??c m?t th?y bao gi?c m?. -[04:10:10] No newline at end of file +[04:10:10]
- 56. 2010/10/05 Subversion 101 Nguyen Vu Hung
- 57. Version Control:: Subversion 101 Nguyen Vu Hung [email_address] 2010/10/05 2010/10/05 Subversion 101 Nguyen Vu Hung