At Sun, 25 Apr 2010 21:34:39 -0400,
David Abrahams wrote:
>
>
> When I use `e' to resolve conflicts during a rebase, then `R' to
> continue rebasing, I often get into trouble because I haven't saved
> the merged files. This little patch seems to fix it nicely for me.
Ah, whoops— wrong patch!
Please try this one instead:
diff --git a/magit.el b/magit.el
index af15e0f..2a3f75d 100644
--- a/magit.el
+++ b/magit.el
@@ -3446,9 +3446,11 @@ Prefix arg means justify as well."
(buffer-C ediff-buffer-C)
(buffer-Ancestor ediff-ancestor-buffer)
(file magit-ediff-file)
+ (file-buffer)
(windows magit-ediff-windows))
(ediff-cleanup-mess)
(find-file file)
+ (setq file-buffer (current-buffer))
(erase-buffer)
(insert-buffer-substring buffer-C)
(kill-buffer buffer-A)
@@ -3456,8 +3458,14 @@ Prefix arg means justify as well."
(kill-buffer buffer-C)
(when (bufferp buffer-Ancestor) (kill-buffer
buffer-Ancestor))
(set-window-configuration windows)
- (message "Conflict resolution finished; you may save the
buffer")))))))
+ (if magit-save-some-buffers
+ (save-some-buffers (eq
+ magit-save-some-buffers
+ 'dontask) (lambda () (eq (current-buffer)
+ file-buffer)))
+
+ (message "Conflict resolution finished; you may save the
buffer"))))))))
(defun magit-interactive-resolve-item ()
(interactive)
--
Dave Abrahams Meet me at BoostCon: http://www.boostcon.com
BoostPro Computing
http://www.boostpro.com
--
Subscription settings: http://groups.google.com/group/magit/subscribe?hl=en
