From: Glenn Morris <rgm@gnu.org>
Date: Sat, 5 Feb 2011 22:46:34 +0000 (-0800)
Subject: bzrmerge.el trivia.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~1019
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4d881c83419fbdbcfc4ba8cc8b0ef88eb9c45ccd;p=emacs.git

bzrmerge.el trivia.

* admin/bzrmerge.el (bzrmerge-warning-buffer): New constant.
(bzrmerge-apply): Use it.
(bzrmerge): Kill any old warning buffer first.
---

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 46dbaa0da26..0ca88ee84d5 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-05  Glenn Morris  <rgm@gnu.org>
+
+	* bzrmerge.el (bzrmerge-warning-buffer): New constant.
+	(bzrmerge-apply): Use it.
+	(bzrmerge): Kill any old warning buffer first.
+
 2011-02-03  Glenn Morris  <rgm@gnu.org>
 
 	* bzrmerge.el (bzrmerge-buffer): New constant.
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 350f3795c52..061af80b6cf 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -35,6 +35,9 @@
 (defconst bzrmerge-buffer "*bzrmerge*"
   "Working buffer for bzrmerge.")
 
+(defconst bzrmerge-warning-buffer "*bzrmerge warnings*"
+  "Buffer where bzrmerge will display any warnings.")
+
 (defun bzrmerge-merges ()
   "Return the list of already merged (not yet committed) revisions.
 The list returned is sorted by oldest-first."
@@ -290,7 +293,8 @@ Does not make other difference."
                   ;; are conflicts.
                   (display-warning 'bzrmerge "Resolve conflicts manually.
 ¡BEWARE!  Important metadata is kept in this Emacs session!
-Do not commit without re-running `M-x bzrmerge' first!"))
+Do not commit without re-running `M-x bzrmerge' first!"
+                                   :warning bzrmerge-warning-buffer))
               (error "Resolve conflicts manually")))))
         (cons merge skip)))))
 
@@ -305,6 +309,10 @@ Do not commit without re-running `M-x bzrmerge' first!"))
              (when (re-search-forward "submit branch: *" nil t)
                (buffer-substring (point) (line-end-position))))))
       (read-file-name "From branch: " nil nil nil def))))
+  ;; Eg we ran bzrmerge once, it stopped with conflicts, we fixed them
+  ;; and are running it again.
+  (if (get-buffer bzrmerge-warning-buffer)
+      (kill-buffer bzrmerge-warning-buffer))
   (message "Merging from %s..." from)
   (require 'vc-bzr)
   (let ((default-directory (or (vc-bzr-root default-directory)