[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-svn.el,v [EMACS_22_BASE]
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-svn.el,v [EMACS_22_BASE] |
Date: |
Tue, 15 Jan 2008 04:37:26 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Dan Nicolaescu <dann> 08/01/15 04:37:25
Index: vc-svn.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-svn.el,v
retrieving revision 1.34.2.3
retrieving revision 1.34.2.4
diff -u -b -r1.34.2.3 -r1.34.2.4
--- vc-svn.el 7 Jan 2008 02:44:07 -0000 1.34.2.3
+++ vc-svn.el 15 Jan 2008 04:37:19 -0000 1.34.2.4
@@ -497,8 +497,10 @@
"Call \"svn resolved\" if the conflict markers have been removed."
(save-excursion
(goto-char (point-min))
- (if (not (re-search-forward "^<<<<<<< " nil t))
- (vc-svn-command nil 0 buffer-file-name "resolved"))))
+ (unless (re-search-forward "^<<<<<<< " nil t)
+ (vc-svn-command nil 0 buffer-file-name "resolved")
+ ;; Remove the hook so that it is not called multiple times.
+ (remove-hook 'after-save-hook 'vc-svn-resolve-when-done t))))
;; Inspired by vc-arch-find-file-hook.
(defun vc-svn-find-file-hook ()