Commit 9341ff29 authored by André Spiegel's avatar André Spiegel
Browse files

(vc-next-action-on-file): Query when trying to lock non-latest

version.
parent c8de1d91
...@@ -531,7 +531,15 @@ to an optional list of FLAGS." ...@@ -531,7 +531,15 @@ to an optional list of FLAGS."
(concat "-b" rev))) (concat "-b" rev)))
(vc-checkout file nil rev)) (vc-checkout file nil rev))
(error "Sorry, this is not implemented for SCCS.")) (error "Sorry, this is not implemented for SCCS."))
(vc-checkout-writable-buffer file)))) (if (vc-latest-on-branch-p file)
(vc-checkout-writable-buffer file)
(if (yes-or-no-p
"This is not the latest version. Really lock it? ")
(vc-checkout-writable-buffer file)
(if (yes-or-no-p "Lock the latest version instead? ")
(vc-checkout-writable-buffer file
(vc-branch-part (vc-workfile-version file))))))
)))
;; a checked-out version exists, but the user may not own the lock ;; a checked-out version exists, but the user may not own the lock
((and (not (eq vc-type 'CVS)) ;There are no locks in CVS. ((and (not (eq vc-type 'CVS)) ;There are no locks in CVS.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment