# HG changeset patch # User Eric S. Raymond # Date 1210198268 0 # Node ID 3bbff46b71301dc50c06895bc8b1520a343a769c # Parent bf91c987049c5e94f16d4c7b8f1ad66160873587 Meta-CVS support removed. diff -r bf91c987049c -r 3bbff46b7130 doc/emacs/ChangeLog --- a/doc/emacs/ChangeLog Wed May 07 21:27:41 2008 +0000 +++ b/doc/emacs/ChangeLog Wed May 07 22:11:08 2008 +0000 @@ -1,3 +1,8 @@ +2008-05-07 Eric S. Raymond + + * aack.texi, files.texi, vc2-xtra.texi: Meta-CVS is no longer + supported. + 2008-05-02 Eric S. Raymond * emacs/buffers.texi, emacs/files.texi (Version-control): diff -r bf91c987049c -r 3bbff46b7130 doc/emacs/ack.texi --- a/doc/emacs/ack.texi Wed May 07 21:27:41 2008 +0000 +++ b/doc/emacs/ack.texi Wed May 07 22:11:08 2008 +0000 @@ -825,7 +825,7 @@ @end itemize @item -Stefan Monnier added support for Arch, Subversion, and Meta-CVS to VC, +Stefan Monnier added support for Arch and Subversion to VC, and re-wrote much of the Emacs server to use the built-in networking primitives. He also wrote: diff -r bf91c987049c -r 3bbff46b7130 doc/emacs/files.texi --- a/doc/emacs/files.texi Wed May 07 21:27:41 2008 +0000 +++ b/doc/emacs/files.texi Wed May 07 22:11:08 2008 +0000 @@ -1213,7 +1213,7 @@ The Emacs version control interface is called VC. Its commands work with different version control systems---currently, it supports CVS, -GNU Arch, RCS, Meta-CVS, Subversion, and SCCS. Of these, the GNU +GNU Arch, RCS, Subversion, and SCCS. Of these, the GNU project distributes CVS, GNU Arch, and RCS. 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 @@ -1291,8 +1291,8 @@ @subsubsection Supported Version Control Systems @cindex back end (version control) - VC currently works with six different version control systems or -``back ends'': SCCS, RCS, CVS, Meta-CVS, Subversion, GNU Arch, + VC currently works with many different version control systems or +``back ends'': SCCS, RCS, CVS, Subversion, GNU Arch, git, and Mercurial. @comment Omitting bzr because support is very scratchy and incomplete. @@ -1326,13 +1326,6 @@ also that before using CVS you must set up a repository, which is a subject too complex to treat here. -@cindex Meta-CVS - Meta-CVS uses CVS repositories, but has an enhanced client that -uses client-side information to solve various of the known problems -with CVS. It is not widely used, having been overtaken by Subversion. -The Emacs support for it is rudimentary, and may be removed in a -future version. - @cindex SVN @cindex Subversion Subversion is a free version control system designed to be similar diff -r bf91c987049c -r 3bbff46b7130 doc/emacs/vc2-xtra.texi --- a/doc/emacs/vc2-xtra.texi Wed May 07 21:27:41 2008 +0000 +++ b/doc/emacs/vc2-xtra.texi Wed May 07 22:11:08 2008 +0000 @@ -597,7 +597,7 @@ @vindex vc-handled-backends The variable @code{vc-handled-backends} determines which version control systems VC should handle. The default value is @code{(RCS CVS -SVN SCCS BZR GIT HG Arch MCVS)}, so it contains all the version systems +SVN SCCS BZR GIT HG Arch)}, so it contains all the version systems that are currently supported. If you want VC to ignore one or more of these systems, exclude its name from the list. To disable VC entirely, set this variable to @code{nil}. diff -r bf91c987049c -r 3bbff46b7130 etc/ChangeLog --- a/etc/ChangeLog Wed May 07 21:27:41 2008 +0000 +++ b/etc/ChangeLog Wed May 07 22:11:08 2008 +0000 @@ -1,3 +1,7 @@ +2008-05-07 Eric S. Raymond + + * NEWS: Support for Meta-CVS removed. + 2008-05-05 Nick Roberts * compilation.txt: Add regexp for Open Watcom compiler output. diff -r bf91c987049c -r 3bbff46b7130 etc/NEWS --- a/etc/NEWS Wed May 07 21:27:41 2008 +0000 +++ b/etc/NEWS Wed May 07 22:11:08 2008 +0000 @@ -538,6 +538,9 @@ For now only CVS, RCS, SCCS and SVN support this functionality. This is done by the `modify-change-comment' backend function. +*** VC Support for Meta-CVS has been removed for lack of maintainer able +to update it to the new VC. + ** smerge-refine highlights word-level details of changes in conflict. It's used automatically as you move through conflicts, see smerge-auto-refine. diff -r bf91c987049c -r 3bbff46b7130 lisp/ChangeLog --- a/lisp/ChangeLog Wed May 07 21:27:41 2008 +0000 +++ b/lisp/ChangeLog Wed May 07 22:11:08 2008 +0000 @@ -2,6 +2,7 @@ * vc.el, vc-dispatcher.el: VC-Dired support removed. The code uses a ewoc-based implementation now. + * vc-hooks.el: Support for Meta-CVS has been removed. 2008-05-07 Stefan Monnier diff -r bf91c987049c -r 3bbff46b7130 lisp/vc-hooks.el --- a/lisp/vc-hooks.el Wed May 07 21:27:41 2008 +0000 +++ b/lisp/vc-hooks.el Wed May 07 22:11:08 2008 +0000 @@ -16,7 +16,7 @@ ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. +;; NU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see . @@ -60,7 +60,7 @@ :type 'regexp :group 'vc) -(defcustom vc-handled-backends '(RCS CVS SVN SCCS Bzr Git Hg Mtn Arch MCVS) +(defcustom vc-handled-backends '(RCS CVS SVN SCCS Bzr Git Hg Mtn Arch) ;; RCS, CVS, SVN and SCCS come first because they are per-dir ;; rather than per-tree. RCS comes first because of the multibackend ;; support intended to use RCS for local commits (with a remote CVS server). @@ -75,6 +75,7 @@ :group 'vc) ;; Note: we don't actually have a darcs back end yet. +;; Also, Meta-CVS (corresponsding to MCVS) is unsupported. (defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" ".svn" ".git" ".hg" ".bzr" "_MTN" "_darcs" "{arch}") diff -r bf91c987049c -r 3bbff46b7130 lisp/vc-mcvs.el --- a/lisp/vc-mcvs.el Wed May 07 21:27:41 2008 +0000 +++ b/lisp/vc-mcvs.el Wed May 07 22:11:08 2008 +0000 @@ -3,7 +3,7 @@ ;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) -;; Maintainer: Stefan Monnier +;; Maintainer: None ;; This file is part of GNU Emacs.