From: Karl Heuer <kwzh@gnu.org>
Date: Fri, 9 Jun 1995 01:21:18 +0000 (+0000)
Subject: (vc-backend-checkin): Handle RCS `co'-output in the event
X-Git-Tag: emacs-19.34~3706
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d144b028628359a78aa0f9177b3a2be1b3512292;p=emacs.git

(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.
---

diff --git a/lisp/vc.el b/lisp/vc.el
index 4d5e29c86f6..3b9fbbb7741 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -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.