Meta-CVS support removed.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 5453df460d890aff8e187a3972aa4365a0472dff..25cf9dd8e58dce01aa98e4cfe80afda40dd7c16a 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-07  Eric S. Raymond  <esr@snark.thyrsus.com>
+
+       * aack.texi, files.texi, vc2-xtra.texi: Meta-CVS is no longer 
+       supported.
+
 2008-05-02  Eric S. Raymond  <esr@snark.thyrsus.com>
 
        * emacs/buffers.texi, emacs/files.texi (Version-control):

diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 1eec6e55bd4c7bbe47acf9a1cff4654ced1b32eb..02ac0f56002ad27104aecd7b80b8b70b9b71681a 100644 (file)
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -825,7 +825,7 @@ the @code{ebrowse} C@t{++} browser,
 @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 --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 93883e847eee788555567209935720fced212745..0535a01aed0925df32258147465c16a03a60a1dd 100644 (file)
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1213,7 +1213,7 @@ description of what was changed in that version.
 
   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 @@ become a vitally important form of communication among developers.
 @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 @@ common tasks you still need to call CVS from the command line.  Note
 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 --git a/doc/emacs/vc2-xtra.texi b/doc/emacs/vc2-xtra.texi
index bf7343bf91979137b46011721b6a8bb0f9dded2b..c4d6eac0c46f5ed22a1e3cb621fc7786a05f080c 100644 (file)
--- a/doc/emacs/vc2-xtra.texi
+++ b/doc/emacs/vc2-xtra.texi
@@ -597,7 +597,7 @@ headers.
 @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 --git a/etc/ChangeLog b/etc/ChangeLog
index 613b998d56304086562b1987b66becc84032bc86..97860693438b0baa8d012fd395a4d3f0657d8f15 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-07  Eric S. Raymond  <esr@snark.thyrsus.com>
+
+       * NEWS: Support for Meta-CVS removed.
+
 2008-05-05  Nick Roberts  <nickrob@snap.net.nz>
 
        * compilation.txt: Add regexp for Open Watcom compiler output.

diff --git a/etc/NEWS b/etc/NEWS
index 21f925e8293cc5695e9ca184f35dd15209cc6f54..cc788d746d31865a85bce5bc55f2d2792f9f9d3d 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -538,6 +538,9 @@ active.
 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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 437c4c2af3f2de896028b5900bda043918bb2d92..3dc7b942e1c391cca0dc0aecce593cc758708444 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 1e2101e1361b0ac79510b4a1d1a0131e9ec59489..06b1b3d36a97b7565fff3b1314e9f04cc3683ce8 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -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 <http://www.gnu.org/licenses/>.
@@ -60,7 +60,7 @@ interpreted as hostnames."
   :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 @@ An empty list disables VC altogether."
   :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 --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el
index 2a8ea2cfb851fc7f3fd423e653011876ea2f7451..9eb915030890fcdc52f72e4651472342db5fdac1 100644 (file)
--- a/lisp/vc-mcvs.el
+++ b/lisp/vc-mcvs.el
@@ -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 <monnier@gnu.org>
+;; Maintainer:  None
 
 ;; This file is part of GNU Emacs.