Mercurial > emacs
comparison lisp/vc-svn.el @ 87785:8f1628da223f
* smerge-mode.el (smerge-start-session): Rename from smerge-auto.
* pcvs.el (cvs-revert-if-needed):
* vc.el (vc-maybe-resolve-conflicts): Rename callers.
* vc-svn.el (vc-svn-find-file-hook):
* vc-arch.el (vc-arch-find-file-hook): Undo previous change.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 16 Jan 2008 06:22:59 +0000 |
| parents | c2a952d12e21 |
| children | 800f4ac6c848 |
comparison
equal
deleted
inserted
replaced
| 87784:01f002639254 | 87785:8f1628da223f |
|---|---|
| 549 (if (save-excursion | 549 (if (save-excursion |
| 550 (goto-char (point-min)) | 550 (goto-char (point-min)) |
| 551 (re-search-forward "^<<<<<<< " nil t)) | 551 (re-search-forward "^<<<<<<< " nil t)) |
| 552 ;; There are conflict markers. | 552 ;; There are conflict markers. |
| 553 (progn | 553 (progn |
| 554 (smerge-auto) | 554 (smerge-start-session) |
| 555 (add-hook 'after-save-hook 'vc-svn-resolve-when-done nil t)) | 555 (add-hook 'after-save-hook 'vc-svn-resolve-when-done nil t)) |
| 556 ;; There are no conflict markers. This is problematic: maybe it means | 556 ;; There are no conflict markers. This is problematic: maybe it means |
| 557 ;; the conflict has been resolved and we should immediately call "svn | 557 ;; the conflict has been resolved and we should immediately call "svn |
| 558 ;; resolved", or it means that the file's type does not allow Svn to | 558 ;; resolved", or it means that the file's type does not allow Svn to |
| 559 ;; use conflict markers in which case we don't really know what to do. | 559 ;; use conflict markers in which case we don't really know what to do. |