diff options
| author | André Spiegel <spiegel@gnu.org> | 1995-10-04 15:13:04 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 1995-10-04 15:13:04 +0000 |
| commit | c17b08d7377e27bca3ca0343f8d0b371e9eeaf61 (patch) | |
| tree | fc29d94dae35fd37f7dffe2422a11ea490a05673 /lisp/vc.el | |
| parent | 90954b455dc355ddecbebace405285e0ef4b1536 (diff) | |
| download | emacs-c17b08d7377e27bca3ca0343f8d0b371e9eeaf61.tar.gz | |
(vc-next-action-on-file): When locking the latest trunk version,
use empty version number.
Diffstat (limited to 'lisp/vc.el')
| -rw-r--r-- | lisp/vc.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 266d454be7c..54d43ef08a5 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -647,7 +647,9 @@ to an optional list of FLAGS." (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)))))) + (if (vc-trunk-p (vc-workfile-version file)) + "" ;; this means check out latest on trunk + (vc-branch-part (vc-workfile-version file))))))) ))) ;; a checked-out version exists, but the user may not own the lock |