Link
Embed
Share
Beginning
This slide
Copy link URL
Copy link URL
Copy iframe embed code
Copy iframe embed code
Copy javascript embed code
Copy javascript embed code
Share
Tweet
Share
Tweet
Slide 1
Slide 1 text
rcs / cvs ͏ΊΑ͏ Shintaro Kojima
Slide 2
Slide 2 text
!!! koji: ;Δ͍ͷɼͲ͜ʹ͋Δ͔ͳ ????: RCS͔ΜΓͯ͠͠·͍·͠ ͨ...
Slide 3
Slide 3 text
VCS 1982 1990 2000 2005 rcs cvs subversion git mercurial bazaar
Slide 4
Slide 4 text
ʮrcs/cvs͕ѱ͍ʯ ͱݴ͍͍ͨͷͰͳ͘ɼ ʮతʹબ͢Δͷ ؒҧ͍ͬͯ·͢ʯ ͱݴ͍͍ͨ
Slide 5
Slide 5 text
͍ɼͰͬͺΓ rcs ѱ͍ conflict Λݕग़͠ͳ͍ ϑΝΠϧϩοΫͰ͖Δ มߋΛɼޙͷ”co -l” ্͕ॻ͖ ͯ͠͠·͏
Slide 6
Slide 6 text
VCS rcs cvs sub version git current dir ͷΈ Yes No No Yes ࢄܕ No No No Yes Τϯίʔυ x x o o Ϛʔδ x 3way 2way 3way
Slide 7
Slide 7 text
༻్ʹΑͬͯదͳ VCS ҧ͏ͱݴ͏ͷͷ ʮ΄Μͱ͏ʹrcs/cvsͰ͍ ͍ͷ͔ʁʯͱߟ͑ͯΈͨ΄͏ ͕͍͍ͱࢥ͍·͢ɽ
Slide 8
Slide 8 text
rcs ΛΊΔͱ ഇࢭͰ͖·͢ Subject: [ALERT 470439] Warning: RCS isn't completed well. From: RCS Alert To:
[email protected]
Date: Tue, 14 Feb 2012 20:00:05 +0900 (JST) ## RCS warning from server xxx ## /some/file remains a write permission. ...
Slide 9
Slide 9 text
VCS rcs cvs subversion git cvs init svnadmin create git init cvs import svn import co -l git add ci -u cvs commit svn commit git commit -a cvs status svn status git status rcsdiff cvs diff svn diff git diff
Slide 10
Slide 10 text
·ͱΊ ͍Ζ͍Ζཧ༝͕͋ͬͯબΜͰ͍Δͱࢥ ͍·͕͢ɼ ʮ΄Μͱ͏ʹrcs/cvsͰ͍ ͍Μ͚ͩͬʁʯ ͬͯߟ͑ͯΈ͍ͯͩ͘͞ɽ
Slide 11
Slide 11 text
͓·͚ subversion / git / mercurial / bazaar ͍Ζ͍Ζ͍͍ͷ͋Γ·͕͢ɼʮͲΕͰ͍͍ͷͰ Φεεϝʁʯͱ͍͏ਓʹ git ࢄϨϙδτϦͱ“git rebase” “git bisect” ɼͨ·Γ·ͤΜ