Mercurial > emacs
comparison lisp/vc.el @ 14040:187735b53d52
Comment fixes.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Fri, 05 Jan 1996 22:21:28 +0000 |
parents | ee57ee38cdb5 |
children | c8c5b83d9691 |
comparison
equal
deleted
inserted
replaced
14039:831c5fda97f4 | 14040:187735b53d52 |
---|---|
825 (format "Initial version level for %s: " buffer-file-name)))) | 825 (format "Initial version level for %s: " buffer-file-name)))) |
826 ) | 826 ) |
827 | 827 |
828 (defun vc-resynch-window (file &optional keep noquery) | 828 (defun vc-resynch-window (file &optional keep noquery) |
829 ;; If the given file is in the current buffer, | 829 ;; If the given file is in the current buffer, |
830 ;; either revert on it so we see expanded keyworks, | 830 ;; either revert on it so we see expanded keywords, |
831 ;; or unvisit it (depending on vc-keep-workfiles) | 831 ;; or unvisit it (depending on vc-keep-workfiles) |
832 ;; NOQUERY if non-nil inhibits confirmation for reverting. | 832 ;; NOQUERY if non-nil inhibits confirmation for reverting. |
833 ;; NOQUERY should be t *only* if it is known the only difference | 833 ;; NOQUERY should be t *only* if it is known the only difference |
834 ;; between the buffer and the file is due to RCS rather than user editing! | 834 ;; between the buffer and the file is due to RCS rather than user editing! |
835 (and (string= buffer-file-name file) | 835 (and (string= buffer-file-name file) |
2004 (defun vc-backend-checkin (file rev comment) | 2004 (defun vc-backend-checkin (file rev comment) |
2005 ;; Register changes to FILE as level REV with explanatory COMMENT. | 2005 ;; Register changes to FILE as level REV with explanatory COMMENT. |
2006 ;; Automatically retrieves a read-only version of the file with | 2006 ;; Automatically retrieves a read-only version of the file with |
2007 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise | 2007 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise |
2008 ;; it deletes the workfile. | 2008 ;; it deletes the workfile. |
2009 ;; Adaption for RCS branch support: if this is an explicit checkin, | 2009 ;; Adaptation for RCS branch support: if this is an explicit checkin, |
2010 ;; or if the checkin creates a new branch, set the master file branch | 2010 ;; or if the checkin creates a new branch, set the master file branch |
2011 ;; accordingly. | 2011 ;; accordingly. |
2012 (message "Checking in %s..." file) | 2012 (message "Checking in %s..." file) |
2013 ;; "This log message intentionally left almost blank". | 2013 ;; "This log message intentionally left almost blank". |
2014 ;; RCS 5.7 gripes about white-space-only comments too. | 2014 ;; RCS 5.7 gripes about white-space-only comments too. |
2416 ;;; | 2416 ;;; |
2417 ;;; The race condition implies that we have to either (a) lock the master | 2417 ;;; The race condition implies that we have to either (a) lock the master |
2418 ;;; during the entire execution of vc-next-action, or (b) detect and | 2418 ;;; during the entire execution of vc-next-action, or (b) detect and |
2419 ;;; recover from errors resulting from dispatch on an out-of-date state. | 2419 ;;; recover from errors resulting from dispatch on an out-of-date state. |
2420 ;;; | 2420 ;;; |
2421 ;;; Alternative (a) appears to be unfeasible. The problem is that we can't | 2421 ;;; Alternative (a) appears to be infeasible. The problem is that we can't |
2422 ;;; guarantee that the lock will ever be removed. Suppose a user starts a | 2422 ;;; guarantee that the lock will ever be removed. Suppose a user starts a |
2423 ;;; checkin, the change message buffer pops up, and the user, having wandered | 2423 ;;; checkin, the change message buffer pops up, and the user, having wandered |
2424 ;;; off to do something else, simply forgets about it? | 2424 ;;; off to do something else, simply forgets about it? |
2425 ;;; | 2425 ;;; |
2426 ;;; Alternative (b), on the other hand, works well with a cheap way to speed up | 2426 ;;; Alternative (b), on the other hand, works well with a cheap way to speed up |