[Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el

[Stefan Monnier]

Index: emacs/lisp/pcvs-parse.el
diff -c emacs/lisp/pcvs-parse.el:1.12 emacs/lisp/pcvs-parse.el:1.13
*** emacs/lisp/pcvs-parse.el:1.12       Mon Jun 24 18:49:06 2002
--- emacs/lisp/pcvs-parse.el    Mon Sep  2 21:23:15 2002
***************
*** 5,11 ****
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: pcl-cvs
! ;; Revision: $Id: pcvs-parse.el,v 1.12 2002/06/24 22:49:06 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 5,11 ----
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: pcl-cvs
! ;; Revision: $Id: pcvs-parse.el,v 1.13 2002/09/03 01:23:15 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 266,272 ****
         ;; [-n update] A new (or pruned) directory appeared but isn't traversed
         (and
        (cvs-match "New directory `\\(.*\\)' -- ignored$" (dir 1))
!       (cvs-parsed-fileinfo 'MESSAGE " " (file-name-as-directory dir)))
  
         ;; File removed, since it is removed (by third party) in repository.
         (and
--- 266,273 ----
         ;; [-n update] A new (or pruned) directory appeared but isn't traversed
         (and
        (cvs-match "New directory `\\(.*\\)' -- ignored$" (dir 1))
!       ;; (cvs-parsed-fileinfo 'MESSAGE " " (file-name-as-directory dir))
!       (cvs-parsed-fileinfo '(NEED-UPDATE . NEW-DIR) dir))
  
         ;; File removed, since it is removed (by third party) in repository.
         (and
***************
*** 286,291 ****
--- 287,295 ----
         (and
        (cvs-match "\\(.*\\), version \\(.*\\), resurrected$"
                   (path 1) (base-rev 2))
+       ;; FIXME: resurrection only brings back the original version,
+       ;; not the latest on the branch, so `up-to-date' is not always
+       ;; what we want.
        (cvs-parsed-fileinfo '(UP-TO-DATE . RESURRECTED) path nil
                             :base-rev base-rev))
  
***************
*** 444,449 ****
--- 448,454 ----
        (cvs-match "Locally Removed$"   (type 'REMOVED))
        (cvs-match "Locally Modified$"  (type 'MODIFIED))
        (cvs-match "Needs Merge$"               (type 'NEED-MERGE))
+       (cvs-match "Entry Invalid"      (type '(NEED-MERGE . REMOVED)))
        (cvs-match "Unknown$"           (type 'UNKNOWN)))
       (cvs-match "$")
       (cvs-or