Index: man/files.texi =================================================================== RCS file: /cvsroot/emacs/emacs/man/files.texi,v retrieving revision 1.91 diff -u -w -b -B -r1.91 files.texi --- man/files.texi 9 Oct 2004 18:41:18 -0000 1.91 +++ man/files.texi 9 Nov 2004 06:57:21 -0000 @@ -1119,11 +1119,12 @@ description of what was changed in that version. The Emacs version control interface is called VC. Its commands work -with three version control systems---RCS, CVS, and SCCS. The GNU -project recommends RCS and CVS, which are free software and available -from the Free Software Foundation. We also have free software to -replace SCCS, known as CSSC; if you are using SCCS and don't want to -make the incompatible change to RCS or CVS, you can switch to CSSC. +with different version control systems---RCS, CVS, SCCS, Meta-CVS, GNU +Arch and Subversion. The GNU project recommends RCS, CVS, and GNU Arch +which are free software and available from the Free Software Foundation. +We also have free software to replace SCCS, known as CSSC; if you are +using SCCS and don't want to make the incompatible change to RCS or CVS, +you can switch to CSSC. VC is enabled by default in Emacs. To disable it, set the customizable variable @code{vc-handled-backends} to @code{nil} @@ -1166,8 +1167,9 @@ @cindex RCS @cindex back end (version control) - VC currently works with three different version control systems or -``back ends'': RCS, CVS, and SCCS. + VC currently works with six different version control systems or +``back ends'': RCS, CVS, SCCS, MCVS (Meta-CVS), Arch (GNU Arch) and SVN +(Subversion). RCS is a free version control system that is available from the Free Software Foundation. It is perhaps the most mature of the supported @@ -1190,6 +1192,33 @@ features, such as multiple branches, are not available with SCCS. You should use SCCS only if for some reason you cannot use RCS. +@cindex MCVS +@cindex Meta-CVS + +Meta-CVS is another attempt to solve problems, arising in CVS. It +supports directory structure versioning, improved branching and merging, +and use of symbolic links and meta-data in repositories. + +@cindex GNU Arch +@cindex Arch + GNU Arch is new version control system that designed for distributed +work. It differs in many ways from old well-known systems, such as CVS +and RCS. It supports different transports for interoperating between +users, offline operations and have good branching and merging features. +It also supports atomic commits, and history of file renaming and +moving. VC supports not all operations, provided by GNU Arch, so you +can call their from command line, or use specialized module. + +@cindex SVN +@cindex Subversion + Subversion is version control system, that was designed for eliminate +problems, that arrive with CVS usage, such as nonatomic commits, and +losing history of file with renaming or moving file. It also could be +used via http or other standard protocols. SVN has almost same concepts +as CVS, but solve some problems. Switching from CVS to SVN is very +easy---just use @command{svn} command instead @command{cvs}. + + @node VC Concepts @subsubsection Concepts of Version Control