summaryrefslogtreecommitdiff
path: root/lisp/vc-rcs.el
diff options
context:
space:
mode:
authorAndré Spiegel <spiegel@gnu.org>2002-12-26 14:38:20 +0000
committerAndré Spiegel <spiegel@gnu.org>2002-12-26 14:38:20 +0000
commite39bd8ac2205e7b0cd7fc527e99c4d5507b0cd4d (patch)
tree4f830d3149e00af0d94f5a01ce7e7b92a4c3c0a9 /lisp/vc-rcs.el
parent04db6f386c39a2f52cb614cc29524cf29f19f365 (diff)
downloademacs-e39bd8ac2205e7b0cd7fc527e99c4d5507b0cd4d.tar.gz
(vc-rcs-checkin): By default, always specify the
current branch of the working file for check-in.
Diffstat (limited to 'lisp/vc-rcs.el')
-rw-r--r--lisp/vc-rcs.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index ca22bac1642..3bcb3c8038a 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -5,7 +5,7 @@
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
-;; $Id: vc-rcs.el,v 1.31 2002/11/13 12:38:20 spiegel Exp $
+;; $Id: vc-rcs.el,v 1.32 2002/12/26 14:06:33 spiegel Exp $
;; This file is part of GNU Emacs.
@@ -325,6 +325,8 @@ whether to remove it."
default-branch)
(setq rev default-branch)
(setq switches (cons "-f" switches)))
+ (if (and (not rev) old-version)
+ (setq rev (vc-branch-part old-version)))
(apply 'vc-do-command nil 0 "ci" (vc-name file)
;; if available, use the secure check-in option
(and (vc-rcs-release-p "5.6.4") "-j")