Open Source Infrastructure: Version Control Systems Jim Blandy
[email protected] Version Control Systems ● SCCS ● RCS ● CVS ● network-transparent CVS ● Subversion ● BitKeeper ● Git ● Mercurial ● Darcs SCCS ● Mark Rochkind, 1972 ● Included in early Unix systems from AT&T ● Managed single files ● “Interleaved” delta format SCCS: Interleaved deltas A int main() { puts (“a”); } SCCS: Interleaved deltas B A int main() int main() { { puts (“b”); puts (“a”); puts (“a”); } } SCCS: Interleaved deltas B A B' int main() int main() int main() { { { puts (“b”); puts (“a”); puts (“a”); puts (“a”); } puts (“b' ”); } } SCCS: Interleaved deltas +A int main() +A { +B puts (“b”); +A puts (“a”); +B' puts (“b' ”); +A } RCS ● Walter Tichy, 1980's ● designed to address SCCS performance issues RCS Creator:inkscape 0.45.1 RCS Creator:inkscape 0.45.1 CVS ● Dick Grune et. al., ~1988 ● full directory trees, not single files ● copy/modify/merge/commit model CVS Creator:inkscape 0.45.1 CVS Creator:inkscape 0.45.1 CVS Creator:inkscape 0.45.1 Network-transparent CVS ● Jim Kingdon, 1990 (Cygnus Solutions) Subversion ● Blandy, Collins-Sussman, Fitzpatrick, Fogel 2000 ● Retains CVS model ● Better performance ● Better features ● Better architecture Subversion Subversion Creator:inkscape 0.45.1 Subversion Creator:inkscape 0.45.1 Subversion Creator:inkscape 0.45.1 BitKeeper ● BitMover (McVoy), 1998 ● Distributed ● Uses SCCS weave file format ● Used for Linux kernel collaboration until 2005 Hash naming Hash naming 76 ● Is 2 a big number? Hash naming 76 22 ● Is 2 a big number?