Mercurial > emacs
comparison lisp/vc-mcvs.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 | 880960b70474 f358a2fd5895 |
| children | 56a72e2bd635 |
comparison
equal
deleted
inserted
replaced
| 91238:5cf14a2107b5 | 91239:2fcaae6177a5 |
|---|---|
| 292 ;; Check checkin problem. | 292 ;; Check checkin problem. |
| 293 (cond | 293 (cond |
| 294 ((re-search-forward "Up-to-date check failed" nil t) | 294 ((re-search-forward "Up-to-date check failed" nil t) |
| 295 (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge)) | 295 (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge)) |
| 296 files) | 296 files) |
| 297 (error (substitute-command-keys | 297 (error "%s" (substitute-command-keys |
| 298 (concat "Up-to-date check failed: " | 298 (concat "Up-to-date check failed: " |
| 299 "type \\[vc-next-action] to merge in changes")))) | 299 "type \\[vc-next-action] to merge in changes")))) |
| 300 (t | 300 (t |
| 301 (pop-to-buffer (current-buffer)) | 301 (pop-to-buffer (current-buffer)) |
| 302 (goto-char (point-min)) | 302 (goto-char (point-min)) |