procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(vc-backend-checkin): Handle RCS `co'-output in the event

Browse source 
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.
This commit is contained in:
Karl Heuer 1995-06-09 01:21:18 +00:00
parent f1b82fc8cf
commit d144b02862
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/vc.el
View file

@ -1683,14 +1683,16 @@ From a program, any arguments are passed to the `rcs2log' script."
(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.