Mercurial > emacs
comparison lisp/vc-arch.el @ 108450:de8a1b891175
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 11 Apr 2010 10:53:01 +0000 |
| parents | 9c5ceea9a88b |
| children |
comparison
equal
deleted
inserted
replaced
| 108449:0346e41d1e53 | 108450:de8a1b891175 |
|---|---|
| 252 (insert-file-contents f) | 252 (insert-file-contents f) |
| 253 ;; Strip the terminating newline. | 253 ;; Strip the terminating newline. |
| 254 (buffer-substring (point-min) (1- (point-max))))))))) | 254 (buffer-substring (point-min) (1- (point-max))))))))) |
| 255 | 255 |
| 256 (defun vc-arch-workfile-unchanged-p (file) | 256 (defun vc-arch-workfile-unchanged-p (file) |
| 257 "Check if FILE is unchanged by diffing against the master version. | 257 "Stub: arch workfiles are always considered to be in a changed state," |
| 258 Return non-nil if FILE is unchanged." | |
| 259 nil) | 258 nil) |
| 260 | 259 |
| 261 (defun vc-arch-state (file) | 260 (defun vc-arch-state (file) |
| 262 ;; There's no checkout operation and merging is not done from VC | 261 ;; There's no checkout operation and merging is not done from VC |
| 263 ;; so the only operation that's state dependent that VC supports is commit | 262 ;; so the only operation that's state dependent that VC supports is commit |