Mercurial > emacs
changeset 12153:69c24a37a560
(vc-backend-checkin): Handle RCS `co'-output in the event
that a check-in only results in reverting to the previous version.
Also be more robust if the new version number cannot be told from
what `co' says.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Fri, 09 Jun 1995 01:21:18 +0000 |
| parents | 19ced24c2963 |
| children | 38a933f88c87 |
| files | lisp/vc.el |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc.el Fri Jun 09 01:17:59 1995 +0000 +++ b/lisp/vc.el Fri Jun 09 01:21:18 1995 +0000 @@ -1683,14 +1683,16 @@ (progn (set-buffer "*vc*") (goto-char (point-min)) - (if (re-search-forward "new revision: \\([0-9.]+\\);" nil t) + (if (or (re-search-forward + "new revision: \\([0-9.]+\\);" nil t) + (re-search-forward + "reverting to previous revision \\([0-9.]+\\)" nil t)) (progn (setq rev (buffer-substring (match-beginning 1) (match-end 1))) (vc-file-setprop file 'vc-workfile-version rev))) - (if (vc-trunk-p rev) - (vc-do-command 0 "rcs" file 'MASTER "-b") - (vc-do-command 0 "rcs" file 'MASTER - (concat "-b" (vc-branch-part rev)))) + (if rev (vc-do-command 0 "rcs" file 'MASTER + (if (vc-trunk-p rev) "-b" + (concat "-b" (vc-branch-part rev))))) (if lock-version ;; exit status of 1 is also accepted. ;; It means that the lock was removed before.