[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el [emacs-unicode-2] |
Date: |
Thu, 14 Oct 2004 05:14:46 -0400 |
Index: emacs/lisp/pcvs-parse.el
diff -c emacs/lisp/pcvs-parse.el:1.19.2.2 emacs/lisp/pcvs-parse.el:1.19.2.3
*** emacs/lisp/pcvs-parse.el:1.19.2.2 Fri Aug 27 07:00:26 2004
--- emacs/lisp/pcvs-parse.el Thu Oct 14 08:50:01 2004
***************
*** 511,525 ****
(cvs-match "new revision: \\([0-9.]*\\); previous revision: .*$"
(subtype 'COMMITTED) (base-rev 1)))
(cvs-or (cvs-match "done$") t)
(progn
;; Try to remove the temp files used by VC.
! (vc-delete-automatic-version-backups (expand-file-name path))
;; it's important here not to rely on the default directory management
;; because `cvs commit' might begin by a series of Examining messages
;; so the processing of the actual checkin messages might begin with
;; a `current-dir' set to something different from ""
(cvs-parsed-fileinfo (cons 'UP-TO-DATE subtype)
! (or path file) (if path 'trust)
:base-rev base-rev)))
;; useless message added before the actual addition: ignored
--- 511,529 ----
(cvs-match "new revision: \\([0-9.]*\\); previous revision: .*$"
(subtype 'COMMITTED) (base-rev 1)))
(cvs-or (cvs-match "done$") t)
+ ;; In cvs-1.12.9 commit messages have been changed and became
+ ;; ambiguous. More specifically, the `path' above is not given.
+ ;; We assume here that in future releases the corresponding info will
+ ;; be put into `file'.
(progn
;; Try to remove the temp files used by VC.
! (vc-delete-automatic-version-backups (expand-file-name (or path file)))
;; it's important here not to rely on the default directory management
;; because `cvs commit' might begin by a series of Examining messages
;; so the processing of the actual checkin messages might begin with
;; a `current-dir' set to something different from ""
(cvs-parsed-fileinfo (cons 'UP-TO-DATE subtype)
! (or path file) 'trust
:base-rev base-rev)))
;; useless message added before the actual addition: ignored
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el [emacs-unicode-2],
Miles Bader <=