emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/vc-cvs.el


From: Miles Bader
Subject: [Emacs-diffs] Changes to emacs/lisp/vc-cvs.el
Date: Fri, 04 Apr 2003 01:23:16 -0500

Index: emacs/lisp/vc-cvs.el
diff -c emacs/lisp/vc-cvs.el:1.51 emacs/lisp/vc-cvs.el:1.52
*** emacs/lisp/vc-cvs.el:1.51   Mon Feb 17 03:11:13 2003
--- emacs/lisp/vc-cvs.el        Thu Mar 27 17:38:38 2003
***************
*** 5,11 ****
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Andre Spiegel <address@hidden>
  
! ;; $Id: vc-cvs.el,v 1.51 2003/02/17 08:11:13 spiegel Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 5,11 ----
  ;; Author:      FSF (see vc.el for full credits)
  ;; Maintainer:  Andre Spiegel <address@hidden>
  
! ;; $Id: vc-cvs.el,v 1.52 2003/03/27 22:38:38 schwab Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 872,881 ****
       (concat "/[^/]+"
             ;; revision
             "/\\([^/]*\\)"
!            ;; timestamp
!            "/\\([^/]*\\)"
!            ;; optional conflict field
!            "\\(+[^/]*\\)?/"
             ;; options
             "\\([^/]*\\)/"
             ;; sticky tag
--- 872,879 ----
       (concat "/[^/]+"
             ;; revision
             "/\\([^/]*\\)"
!            ;; timestamp and optional conflict field
!            "/\\([^/]*\\)/"
             ;; options
             "\\([^/]*\\)/"
             ;; sticky tag
***************
*** 883,895 ****
             "\\(.*\\)"))               ;Sticky tag
      (vc-file-setprop file 'vc-workfile-version (match-string 1))
      (vc-file-setprop file 'vc-cvs-sticky-tag
!                    (vc-cvs-parse-sticky-tag (match-string 5) (match-string 
6)))
      ;; compare checkout time and modification time
      (let ((mtime (nth 5 (file-attributes file))))
        (require 'parse-time)
        (let ((parsed-time
             (parse-time-string (concat (match-string 2) " +0000"))))
!       (cond ((and (car parsed-time)
                    (equal mtime (apply 'encode-time parsed-time)))
               (vc-file-setprop file 'vc-checkout-time mtime)
               (if set-state (vc-file-setprop file 'vc-state 'up-to-date)))
--- 881,894 ----
             "\\(.*\\)"))               ;Sticky tag
      (vc-file-setprop file 'vc-workfile-version (match-string 1))
      (vc-file-setprop file 'vc-cvs-sticky-tag
!                    (vc-cvs-parse-sticky-tag (match-string 4) (match-string 
5)))
      ;; compare checkout time and modification time
      (let ((mtime (nth 5 (file-attributes file))))
        (require 'parse-time)
        (let ((parsed-time
             (parse-time-string (concat (match-string 2) " +0000"))))
!       (cond ((and (not (string-match "\\+" (match-string 2)))
!                   (car parsed-time)
                    (equal mtime (apply 'encode-time parsed-time)))
               (vc-file-setprop file 'vc-checkout-time mtime)
               (if set-state (vc-file-setprop file 'vc-state 'up-to-date)))




reply via email to

[Prev in Thread] Current Thread [Next in Thread]