Mercurial > emacs
comparison lisp/vc-cvs.el @ 91239:2fcaae6177a5
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 16 Dec 2007 05:08:49 +0000 |
| parents | 53108e6cea98 f358a2fd5895 |
| children | 56a72e2bd635 |
comparison
equal
deleted
inserted
replaced
| 91238:5cf14a2107b5 | 91239:2fcaae6177a5 |
|---|---|
| 349 ;; Check checkin problem. | 349 ;; Check checkin problem. |
| 350 (cond | 350 (cond |
| 351 ((re-search-forward "Up-to-date check failed" nil t) | 351 ((re-search-forward "Up-to-date check failed" nil t) |
| 352 (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge)) | 352 (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge)) |
| 353 files) | 353 files) |
| 354 (error (substitute-command-keys | 354 (error "%s" (substitute-command-keys |
| 355 (concat "Up-to-date check failed: " | 355 (concat "Up-to-date check failed: " |
| 356 "type \\[vc-next-action] to merge in changes")))) | 356 "type \\[vc-next-action] to merge in changes")))) |
| 357 (t | 357 (t |
| 358 (pop-to-buffer (current-buffer)) | 358 (pop-to-buffer (current-buffer)) |
| 359 (goto-char (point-min)) | 359 (goto-char (point-min)) |