introduction to subversion

29
Vª SVNF~ƒ^ Use subversion with TortoiseSVN §K Subversion Introduction to version control with svn [U/ Jerry He [email protected] May 25, 2010 Jerry He Introduction to version control with svn

Upload: jerryhe

Post on 14-Jan-2015

1.970 views

Category:

Technology


1 download

DESCRIPTION

A brief introduction to subversion and how to use it.

TRANSCRIPT

Page 1: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

SubversionIntroduction to version control with svn

Û[U/ Jerry [email protected]

May 25, 2010

Jerry He Introduction to version control with svn

Page 2: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

�SN

1 ����V����������nSubversion{0

2 SVNF~¦^SVNÚTortoiseSVN�SCBasic Commands of SVN

3 Use subversion with TortoiseSVNTortoiseSVN{0TortoiseSVN¦^

4 Ù§­�¯Kí�§S8¹õ^r��

Jerry He Introduction to version control with svn

Page 3: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

�SN

1 ����V����������nSubversion{0

2 SVNF~¦^SVNÚTortoiseSVN�SCBasic Commands of SVN

3 Use subversion with TortoiseSVNTortoiseSVN{0TortoiseSVN¦^

4 Ù§­�¯Kí�§S8¹õ^r��

Jerry He Introduction to version control with svn

Page 4: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

�SN

1 ����V����������nSubversion{0

2 SVNF~¦^SVNÚTortoiseSVN�SCBasic Commands of SVN

3 Use subversion with TortoiseSVNTortoiseSVN{0TortoiseSVN¦^

4 Ù§­�¯Kí�§S8¹õ^r��

Jerry He Introduction to version control with svn

Page 5: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

�SN

1 ����V����������nSubversion{0

2 SVNF~¦^SVNÚTortoiseSVN�SCBasic Commands of SVN

3 Use subversion with TortoiseSVNTortoiseSVN{0TortoiseSVN¦^

4 Ù§­�¯Kí�§S8¹õ^r��

Jerry He Introduction to version control with svn

Page 6: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

���������������������������ÄÄÄ������nnnSubversion{{{000

1 ����Vã

Jerry He Introduction to version control with svn

Page 7: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

���������������������������ÄÄÄ������nnnSubversion{{{000

����

^5)û±e¯K

²~�U§�k���wL��{¤

l�����,����Ñu)=Cz£íäbug�Úu �¤

���8k=<3�§Ñ��o§�o�m

=�<'�¹�§=�<vk��oó�

“��§ù�\AT3·���þ�U”Awful!

����·^��

²~C��©�]�"

��CÄ��?�©�"

Jerry He Introduction to version control with svn

Page 8: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

���������������������������ÄÄÄ������nnnSubversion{{{000

�������n

�È��g�§copy+date"

Oþ�;§�;�UC�ÀÜ"

8¹�AT��z"

Jerry He Introduction to version control with svn

Page 9: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

���������������������������ÄÄÄ������nnnSubversion{{{000

©���¯K¤k����^�Ñ�)û�Ø%¯K

¤k�����XÚÑ7L)û���Ó�Ä�¯KµXÛ4^r5��&E§¿���;�¦�Ø�%CXKO<éó¥¥êâ�L�?Uº

ã: ©���¯KJerry He Introduction to version control with svn

Page 10: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

���������������������������ÄÄÄ������nnnSubversion{{{000

©���¯K¤k����^�Ñ�)û�Ø%¯K

Nõ����XÚѦ^/£½ö?Uö)£0�.5)ûù�¯K§ÃXµVSS 3ù���XÚ¥§ó¥3��A½����#N��<é,�©�?1?U"

ã: ©���¯KJerry He Introduction to version control with svn

Page 11: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

���������������������������ÄÄÄ������nnnSubversion{{{000

©���¯K¤k����^�Ñ�)û�Ø%¯K

Subversion!CVS±9Ù¦�����XÚ¦^/E�ö?UöÜ¿0�.5�O£½"

z��^r��rà^�l¥ó¥MïÑ�°�<�ó�B�öö󥥩�Ú8¹��/N�"

^rÒ�±¿1ó�§?UÃ¥�hkB�"

ùhkB�Ü¿¤����#���"

����XÚ~~I�Ü¿§�´�ª§ö�ö��7LKI4Ü¿ó��(?1"

Note: SVN�Jø£½©�õU

Jerry He Introduction to version control with svn

Page 12: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

���������������������������ÄÄÄ������nnnSubversion{{{000

Subversion�A:

SUBVERSION§{¡SVN§“Open,Popular,Free”�����^�

·¶¹Âµsub+version, 6C"

{ü´^!2�¦^

�O^5O�CVS§U«CVS��Ü©A5§¿O\�þÙ§A5"

m !­½!é��ìNvr�

“Real Version”§ë8¹�´��z�"

�fJ�£“All or nothing”¤

�ݯ§Ø 'p§Oþ�;"

Jerry He Introduction to version control with svn

Page 13: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

���������������������������ÄÄÄ������nnnSubversion{{{000

SVN�٧����^�'�

ã: �«����^�'�

Jerry He Introduction to version control with svn

Page 14: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

SVNÚÚÚTortoiseSVN���SSSCCCBasic Commands of SVN

2 SVNF~¦^

Jerry He Introduction to version control with svn

Page 15: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

SVNÚÚÚTortoiseSVN���SSSCCCBasic Commands of SVN

SVNÚTortoiseSVN�SC

For Windowsµvery easy to install

1 http://subversion.apache.org/lastest version “Subversion 1.6.11”

2 install

3 http://tortoisesvn.net/downloadslastest version “TortoiseSVN 1.6.8”

4 reboot

Note: S��TortoiseSVN�7L�­é

Jerry He Introduction to version control with svn

Page 16: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

SVNÚÚÚTortoiseSVN���SSSCCCBasic Commands of SVN

svnadmin create, svn import

Create Repository, Import files

svnadmin create REPOS PATHµ3REPOS PATH?ïá��¥"

svn import [Path] URL: òPath8¹S�¤k©�\\URL�½���¥"

Example

E:\ > mkdir repos

E:\ >svnadmin create repos

E:\ >svn import -m “First repos” E:/test file:///E:/repos

Jerry He Introduction to version control with svn

Page 17: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

SVNÚÚÚTortoiseSVN���SSSCCCBasic Commands of SVN

svn checkout, svn update

Checkout

�^µl�Y¥\Ñó���

^{µsvn checkout URL [´»]

«~µE:>svn checkout file:///E:/repos myrepos

Update

�^µò�Y¥�UC�A�ó���

^{µsvn update [´»]

«~µE:>svn update myrepos

Jerry He Introduction to version control with svn

Page 18: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

SVNÚÚÚTortoiseSVN���SSSCCCBasic Commands of SVN

svn add, delete, copy, move, and so on

svn add

O\©�½ö8¹�] ¥¥§,�commit"^�´T©�½ö8¹®²3�A�8¹þ"

svn delete

íØ3¥¥�©�½ö8¹§,�commit"

svn copy

��©�§,�commit

svn move

£Ä©�½8¹�,8¹¥§��u��!íØ�|Ü

,krevert, resolved, cleanup, log, mkdir, etc.·-§�¦^svn helpÚsvn help command5�w�Ï"

Note:±þ�·-´�éó�B�?1�§¤±�commitâk�

Jerry He Introduction to version control with svn

Page 19: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

TortoiseSVN{{{000TortoiseSVN¦¦¦^̂̂

3 Use subversion with TortoiseSVN

Jerry He Introduction to version control with svn

Page 20: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

TortoiseSVN{{{000TortoiseSVN¦¦¦^̂̂

�ràóäTortoiseSVN

Windowsö�XÚ�rÅ"

ã/z.¡§8¤svnÚsvnadmin·-1óä�õU"

T�rÅ8¤u] +nìõU¥§¦^�B§´uݺ"

SC�{3c¡®²Qã"

Jerry He Introduction to version control with svn

Page 21: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

TortoiseSVN{{{000TortoiseSVN¦¦¦^̂̂

ãI­1

XJ�½�8¹½ö©�®²�B\�A½�] ¥¥§\�±3] +nì¥w�eù©��ãIk�oCz"ù��´TortoiseSVNùo61��Ï��TortoiseSVN\\�¡�­1ãI�õU­1�©�©�ãI"�â©��SubversionG��ØÓ§­1�ãI�ØÓ"

ã: ãI­1

Jerry He Introduction to version control with svn

Page 22: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

TortoiseSVN{{{000TortoiseSVN¦¦¦^̂̂

TortoiseSVN~^õU

Example

Mï��¥

�\��¥

checkout

commit£ØÓ8¹§cJ^�¤

update£Û?I�¤

rename

diff

Jerry He Introduction to version control with svn

Page 23: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

TortoiseSVN{{{000TortoiseSVN¦¦¦^̂̂

?nÀâ

XJSally�?U¬CXKHarry�ó�No�ºù«�¹��”Àâ£conflict¤

�Harry�¦¦��rà^�Ü¿ó¥¥��#?U�ó�B��§©�A �IP�ÀâG�"

��ù«�¹§�k<��âkUån)Ú�ÑÜn�ÀJ"5¿§^�¿ØUgÄ)ûÀâ"

SVNmuö@�µ^u)ûÀâ��m���u£½XÚ¤�5��mL¤"(I think that’s right.)

Jerry He Introduction to version control with svn

Page 24: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

ííí���§§§SSS888¹¹¹õõõ^̂̂rrr������

4 Ù§­�¯K

Jerry He Introduction to version control with svn

Page 25: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

ííí���§§§SSS888¹¹¹õõõ^̂̂rrr������

í�§S8¹

repository�8¶

trunk Ì��branches ©|��£Õá�¤tags IP��§Xv1.0, v2.0

Jerry He Introduction to version control with svn

Page 26: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

ííí���§§§SSS888¹¹¹õõõ^̂̂rrr������

õ^r��

��

svn+svnserveeg: svn://localhost/repossvn+appacheeg:svn checkout http://166.111.**.**/repos

S�¯K

��authzÚpasswd©�"

©|

£ò�,���

��Ò(¾£SVNØv¤

Jerry He Introduction to version control with svn

Page 27: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

ííí���§§§SSS888¹¹¹õõõ^̂̂rrr������

í��Z¢�

Ø+Û«^��ª8��´��Ð��6"

J�ck3�/?1ÿÁ§Ø#Nò��Ø�©�J����¥"

�yª��J�"

gÄ)¤�ÀÜÚ��©�Ø��\��¥¥"

J�c�½���5µk|ugCÚÙ§<£O"

¦^k¿Â�I\¶/©|¶"

Jerry He Introduction to version control with svn

Page 28: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

ííí���§§§SSS888¹¹¹õõõ^̂̂rrr������

Useful SVN links

http://svnbook.red-bean.com/

http://subversion.apache.org/

AnkhSVN http://ankhsvn.tigris.net

Jerry He Introduction to version control with svn

Page 29: Introduction to Subversion

������������VVVãããSVNFFF~~~¦¦¦^̂̂

Use subversion with TortoiseSVNÙÙÙ§§§­­­���¯̄̄KKK

ííí���§§§SSS888¹¹¹õõõ^̂̂rrr������

Thanks for your attention!Q & A

ã:

Jerry He Introduction to version control with svn