Mercurial > emacs

comparison lisp/vc.el @ 12873:03d3b7d60f67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-next-action-on-file): Query when trying to lock non-latest version.
author André Spiegel <spiegel@gnu.org>
date Thu, 17 Aug 1995 13:08:36 +0000
parents 857663042672
children 33a7a6329aa5
comparison
equal deleted inserted replaced
12872:857663042672 12873:03d3b7d60f67
529 (if (eq vc-type 'RCS) 529 (if (eq vc-type 'RCS)
530 (vc-do-command nil 0 "rcs" file 'MASTER 530 (vc-do-command nil 0 "rcs" file 'MASTER
531 (concat "-b" rev))) 531 (concat "-b" rev)))
532 (vc-checkout file nil rev)) 532 (vc-checkout file nil rev))
533 (error "Sorry, this is not implemented for SCCS.")) 533 (error "Sorry, this is not implemented for SCCS."))
534 (vc-checkout-writable-buffer file)))) 534 (if (vc-latest-on-branch-p file)
535 (vc-checkout-writable-buffer file)
536 (if (yes-or-no-p
537 "This is not the latest version. Really lock it? ")
538 (vc-checkout-writable-buffer file)
539 (if (yes-or-no-p "Lock the latest version instead? ")
540 (vc-checkout-writable-buffer file
541 (vc-branch-part (vc-workfile-version file))))))
542 )))
535 543
536 ;; a checked-out version exists, but the user may not own the lock 544 ;; a checked-out version exists, but the user may not own the lock
537 ((and (not (eq vc-type 'CVS)) ;There are no locks in CVS. 545 ((and (not (eq vc-type 'CVS)) ;There are no locks in CVS.
538 (not (string-equal owner (user-login-name)))) 546 (not (string-equal owner (user-login-name))))
539 (if comment 547 (if comment