From d5c0c19aaa05f8ba9a323cc05071e2713c112191 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 9 Jun 2025 11:51:48 +0100 Subject: [PATCH] ; Document recent VC changes regarding file removal * doc/emacs/maintaining.texi (VC With A Merging VCS) (VC With A Locking VCS): Update text about 'C-x v v' with mixed file statuses. * etc/NEWS: Announce the recent improvements. (cherry picked from commit e58635a184a6d725c0c89516132fe4c4b0ec850a) --- doc/emacs/maintaining.texi | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 0da44e4cd12..4ad7ffe8c80 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -536,11 +536,10 @@ or Dired buffer: @itemize @bullet @item If there is more than one file in the VC fileset and the files have -inconsistent version control statuses, signal an error. (Note, -however, that a fileset is allowed to include both newly-added files -and modified files; @pxref{Registering}.) Also signal an error if the -files in the fileset are missing (removed from the filesystem, but -still tracked by version control), or are ignored by version control. +inconsistent version control statuses, signal an error. (Note, however, +that a fileset is allowed to include both newly-added files, removed +files and modified files; @pxref{Registering}.) Also signal an error if +any files in the fileset are ignored by version control. @item If every file in the VC fileset is registered and unchanged with @@ -607,8 +606,7 @@ its default mode), @kbd{C-x v v} does the following: @item If there is more than one file in the VC fileset and the files have inconsistent version control statuses, signal an error. Also signal -an error if the files in the fileset are missing (removed from the -filesystem, but still tracked by version control). +an error if any files in the fileset are ignored by version control. @item If each file in the VC fileset is not registered with a version -- 2.39.5