From: André Spiegel <spiegel@gnu.org>
Date: Wed, 4 Oct 2000 09:59:43 +0000 (+0000)
Subject: #
X-Git-Tag: emacs-pretest-21.0.90~1171
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3388f0a5545501b8ade4c1068bc3252f77fb9e20;p=emacs.git

#
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 349ef1aec2f..cf041145c07 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2000-10-04  Andre Spiegel  <spiegel@gnu.org>
+
+	* vc-hooks.el (vc-before-save, vc-default-make-version-backups, 
+	vc-version-backup-file-name): New functions.
+
+	* files.el (basic-save-buffer): Call vc-before-save before saving.
+	
+	* vc-cvs.el (vc-cvs-make-version-backups): Return t if 
+	vc-cvs-stay-local-p.
+
+	* vc.el (vc-revert-buffer): Handle empty diff properly.
+	(vc-version-backup-file): New function.
+	(vc-checkout): Create a version backup if necessary.
+	(vc-checkin): If a version backup file exists, delete it.
+	(vc-version-diff): Diff locally using version backups, if available.
+	(vc-revert-file): If there's a version backup, revert locally.
+	(vc-transfer-file): Use version backup for base version, if
+	available.  If not, ask for confirmation whether to get it from the
+	server.  Update mode line before check-in.
+
 2000-10-04  Dave Love  <fx@gnu.org>
 
 	* toolbar/tool-bar.el (tool-bar-setup): New function.