diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-10-12 18:01:36 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-10-12 18:01:36 +0000 |
| commit | 3a4653dc58c53ecc4639957e1c9c70b2c1345a55 (patch) | |
| tree | 779bc2371ffe2bcf540a5e49e5d2f94a33b2f705 /lisp/pcvs-parse.el | |
| parent | c443a57b9c410da47a0478937fce717e06856261 (diff) | |
| download | emacs-3a4653dc58c53ecc4639957e1c9c70b2c1345a55.tar.gz | |
(cvs-parse-commit): Fix parsing for new commit message.
Diffstat (limited to 'lisp/pcvs-parse.el')
| -rw-r--r-- | lisp/pcvs-parse.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index 84dbf218581..7ab6c53b4a0 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el @@ -511,15 +511,19 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." (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 path)) + (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) (if path 'trust) + (or path file) 'trust :base-rev base-rev))) ;; useless message added before the actual addition: ignored |