From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: patch for documentation about version control Date: 09 Nov 2004 12:21:34 -0600 Message-ID: <87vfce289d.fsf@floss.red-bean.com> References: Reply-To: kfogel@red-bean.com NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1100024604 28788 80.91.229.6 (9 Nov 2004 18:23:24 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 9 Nov 2004 18:23:24 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 09 19:23:03 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1CRady-0007Dk-00 for ; Tue, 09 Nov 2004 19:23:02 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CRamN-0004c6-OY for ged-emacs-devel@m.gmane.org; Tue, 09 Nov 2004 13:31:43 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CRalx-0004Ql-GU for emacs-devel@gnu.org; Tue, 09 Nov 2004 13:31:17 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CRalu-0004PI-Mt for emacs-devel@gnu.org; Tue, 09 Nov 2004 13:31:15 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CRalu-0004Oq-IP for emacs-devel@gnu.org; Tue, 09 Nov 2004 13:31:14 -0500 Original-Received: from [207.115.63.78] (helo=pimout6-ext.prodigy.net) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CRadG-0005ND-3b for emacs-devel@gnu.org; Tue, 09 Nov 2004 13:22:18 -0500 Original-Received: from floss.red-bean.com (adsl-66-73-172-37.dsl.chcgil.ameritech.net [66.73.172.37]) by pimout6-ext.prodigy.net (8.12.10 milter /8.12.10) with ESMTP id iA9ILFSN136646; Tue, 9 Nov 2004 13:21:15 -0500 Original-Received: from kfogel by floss.red-bean.com with local (Exim 3.36 #1 (Debian)) id 1CRacY-0007Sp-00; Tue, 09 Nov 2004 12:21:34 -0600 Original-To: Alex Ott Emacs: don't cry -- it won't help. In-Reply-To: Original-Lines: 108 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:29664 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:29664 Alex Ott writes: > this patch add some docs about version control systems supported by vc. > > 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. Minor nit: from this sentence "The GNU project recommends RCS, CVS, and GNU Arch which are free software...", some readers could mistakenly infer that the other systems are *not* free software. And because of that lead-in, the next sentence about a free replacement for SCCS only strengthens the misimpression. Since Subversion and Meta-CVS are both free software, could this paragraph be tweaked? Here's one possible rewording: The Emacs version control interface is called VC. Its commands work with different version control systems---RCS, CVS, SCCS, Meta-CVS, GNU Arch and Subversion. The GNU project recommends and distributes RCS, CVS, and GNU Arch. 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. Also, I was looking at the rest of the patch, and saw a few grammar problems: > @@ -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. s/solve problems, arising in/solve the problems of/ > +@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. This had a few problems, so here's a rewrite: + GNU Arch is new version control system that is 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 it has good branching and merging features. +It also supports atomic commits, and history of file renaming and +moving. VC does not support all operations provided by GNU Arch, so you +can invoke it from the command line, or use a 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}. A few problems here too, both in grammar and content, so here's a rewrite: + Subversion is a version control system designed to be similar to CVS +but without CVS's problems. Subversion supports atomic commits, +and versions directories, symbolic links, meta-data, renames, copies, +and deletes. It can be used via http or via its own protocol. By the way, is there any reason not to refer to the respective home pages of these systems? They are: Meta-CVS: http://users.footprints.net/~kaz/mcvs.html GNU Arch: http://www.gnu.org/software/gnu-arch/ Subversion: http://subversion.tigris.org/ Hope this helps, and thanks for writing the new content! -Karl