From: André Spiegel <spiegel@gnu.org>
Date: Tue, 8 Jan 2002 20:09:13 +0000 (+0000)
Subject: #
X-Git-Tag: ttn-vms-21-2-B4~17252
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=54f4223424644830928cca5fd5a52cea9ed5b060;p=emacs.git

#
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 187497ed471..8c093186a74 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2002-01-08  Andre Spiegel  <spiegel@gnu.org>
+
+	Patch by Martin.Lorentzson@telia.com
+
+	* vc-cvs.el (vc-cvs-sticky-date-format-string): New variable.
+	(vc-cvs-sticky-tag-display): New variable.
+	(vc-cvs-mode-line-string): Add sticky-tag to the mode-line.
+	(vc-cvs-checkin): If the input revision is a valid symbolic tag
+	name, we create it as a branch, commit and switch to it.
+	(vc-cvs-retrieve-snapshot): Set file-property sticky-tag.
+	(vc-cvs-valid-symbolic-tag-name-p): New function.
+	(vc-cvs-parse-sticky-tag): New function.
+	(vc-cvs-parse-entry): Added parsing of sticky tags.
+
 2002-01-08  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* international/quail.el (quail-start-translation)