Commits

Anonymous committed 624082f

bug fix, maintainer change

  • Participants
  • Parent commits 858a168

Comments (0)

Files changed (4)

+1998-03-20  SL Baur  <steve@altair.xemacs.org>
+
+	* vc.el:
+	* vc-hooks.el: Mark as not officially maintained.
+
+1998-03-20  William M. Perry  <wmperry@aventail.com>
+
+	* vc.el: regexp changes.
+
 1998-03-08  Kyle Jones  <kyle_jones@wonderworks.com>
 
 	* vc.el (vc-resynch-buffer): Use with-current-buffer
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-VERSION = 1.05
+VERSION = 1.06
 AUTHOR_VERSION =
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = vc
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
 
 ;; Author:     Eric S. Raymond <esr@snark.thyrsus.com>
-;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
+;; 	       Andre Spiegel <spiegel@inf.fu-berlin.de>
+;; Maintainer: XEmacs Development Team <xemacs@xemacs.org>
 ;; Maintainer: (ClearCase) Rod Whitby <rwhitby@geocities.com>
 ;; XEmacs conversion: Steve Baur <steve@altair.xemacs.org>
 
 	       ;; normal entry
 	       ((re-search-forward
 		 (concat "^/" (regexp-quote basename) 
-			 "/\\([^/]*\\)/[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)")
+			 "/\\([^/]*\\)/\\(Result of merge\\+\\)*[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)")
 		 nil t)
 		(setq case-fold-search fold)  ;; restore the old value
 		;; We found it.  Store away version number now that we 
 		;; If the file hasn't been modified since checkout,
 		;; store the checkout-time.
 		(let ((mtime (nth 5 (file-attributes file)))
-		      (second (string-to-number (match-string 6)))
-		      (minute (string-to-number (match-string 5)))
-		      (hour (string-to-number (match-string 4)))
-		      (day (string-to-number (match-string 3)))
-		      (year (string-to-number (match-string 7))))
+		      (second (string-to-number (match-string 7)))
+		      (minute (string-to-number (match-string 6)))
+		      (hour (string-to-number (match-string 5)))
+		      (day (string-to-number (match-string 4)))
+		      (year (string-to-number (match-string 8))))
 		  (if (equal mtime
 			     (encode-time
 			      second minute hour day
 			      (/ (string-match
-				  (match-string 2)
+				  (match-string 3)
 				  "xxxJanFebMarAprMayJunJulAugSepOctNovDec")
 				 3)
 			      year 0))
 ;; Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 
 ;; Author:     Eric S. Raymond <esr@snark.thyrsus.com>
-;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
+;;             Andre Spiegel <spiegel@inf.fu-berlin.de>
+;; Maintainer: XEmacs Development Team <xemacs@xemacs.org>
 ;; Maintainer: (ClearCase) Rod Whitby <rwhitby@geocities.com>
 ;; XEmacs conversion: Steve Baur <steve@altair.xemacs.org>