[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103135: bzrmerge.el trivia.
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103135: bzrmerge.el trivia. |
Date: |
Sat, 05 Feb 2011 14:46:34 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103135
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-05 14:46:34 -0800
message:
bzrmerge.el trivia.
* admin/bzrmerge.el (bzrmerge-warning-buffer): New constant.
(bzrmerge-apply): Use it.
(bzrmerge): Kill any old warning buffer first.
modified:
admin/ChangeLog
admin/bzrmerge.el
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2011-02-03 07:09:50 +0000
+++ b/admin/ChangeLog 2011-02-05 22:46:34 +0000
@@ -1,3 +1,9 @@
+2011-02-05 Glenn Morris <address@hidden>
+
+ * bzrmerge.el (bzrmerge-warning-buffer): New constant.
+ (bzrmerge-apply): Use it.
+ (bzrmerge): Kill any old warning buffer first.
+
2011-02-03 Glenn Morris <address@hidden>
* bzrmerge.el (bzrmerge-buffer): New constant.
=== modified file 'admin/bzrmerge.el'
--- a/admin/bzrmerge.el 2011-02-03 07:09:50 +0000
+++ b/admin/bzrmerge.el 2011-02-05 22:46:34 +0000
@@ -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 @@
;; 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 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103135: bzrmerge.el trivia.,
Glenn Morris <=