Mercurial > emacs

comparison lisp/vc.el @ 79988:a92a30bae128

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-update): Fix bug: Specify branch tip as vc-checkout REVISION.
author Thien-Thi Nguyen <ttn@gnuvola.org>
date Fri, 01 Feb 2008 05:49:49 +0000
parents 7145a0db2111
children 1a844d29f8e3
comparison
equal deleted inserted replaced
79987:6f13ddb7d9e9 79988:a92a30bae128
2595 (interactive) 2595 (interactive)
2596 (vc-ensure-vc-buffer) 2596 (vc-ensure-vc-buffer)
2597 (vc-buffer-sync nil) 2597 (vc-buffer-sync nil)
2598 (let ((file buffer-file-name)) 2598 (let ((file buffer-file-name))
2599 (if (vc-up-to-date-p file) 2599 (if (vc-up-to-date-p file)
2600 (vc-checkout file nil "") 2600 (vc-checkout file nil t)
2601 (if (eq (vc-checkout-model file) 'locking) 2601 (if (eq (vc-checkout-model file) 'locking)
2602 (if (eq (vc-state file) 'edited) 2602 (if (eq (vc-state file) 'edited)
2603 (error 2603 (error
2604 (substitute-command-keys 2604 (substitute-command-keys
2605 "File is locked--type \\[vc-revert-buffer] to discard changes")) 2605 "File is locked--type \\[vc-revert-buffer] to discard changes"))