rcs / cvs ͸ ΋͏΍ΊΑ͏ Shintaro Kojima

!!! koji: ;Δ͍ͷɼͲ͜ʹ͋Δ͔ͳ ????: RCS͔ΜΓͯ͠͠·͍·͠ ͨ...

VCS 1982 1990 2000 2005 rcs cvs subversion git mercurial bazaar

ʮrcs/cvs͕ѱ͍ʯ ͱݴ͍͍ͨͷͰ͸ͳ͘ɼ ʮ໡໨తʹબ୒͢Δͷ͸ ؒҧ͍ͬͯ·͢ʯ ͱݴ͍͍ͨ

͍΍ɼͰ΋΍ͬͺΓ rcs ͸ѱ͍ conflict Λݕग़͠ͳ͍ ϑΝΠϧϩοΫ͸Ͱ͖Δ มߋΛɼޙͷ”co -l” ্͕ॻ͖ ͯ͠͠·͏

VCS rcs cvs sub version git current dir ͷΈ Yes No No Yes ෼ࢄܕ No No No Yes Τϯίʔυ x x o o Ϛʔδ x 3way 2way 3way

༻్ʹΑͬͯద੾ͳ VCS ͸ҧ͏ͱ͸ݴ͏΋ͷͷ ʮ΄Μͱ͏ʹrcs/cvsͰ͍ ͍ͷ͔ʁʯͱߟ͑ͯΈͨ΄͏ ͕͍͍ͱࢥ͍·͢ɽ

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. ...

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

·ͱΊ ͍Ζ͍Ζཧ༝͕͋ͬͯબΜͰ͍Δͱࢥ ͍·͕͢ɼ ʮ΄Μͱ͏ʹrcs/cvsͰ͍ ͍Μ͚ͩͬʁʯ ͬͯߟ͑ͯΈ͍ͯͩ͘͞ɽ

͓·͚ subversion / git / mercurial / bazaar ͍Ζ͍Ζ͍͍ͷ͸͋Γ·͕͢ɼʮͲΕͰ΋͍͍ͷͰ Φεεϝ͸ʁʯͱ͍͏ਓʹ͸ git ෼ࢄϨϙδτϦͱ“git rebase” “git bisect” ͸ɼͨ·Γ·ͤΜ