mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

bzrmerge.el trivia.

Browse source 
* admin/bzrmerge.el (bzrmerge-warning-buffer): New constant.
(bzrmerge-apply): Use it.
(bzrmerge): Kill any old warning buffer first.
This commit is contained in:
Glenn Morris 2011-02-05 14:46:34 -08:00
parent 233ba4d924
commit 4d881c8341
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
admin/ChangeLog
View file

@ -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.

10
admin/bzrmerge.el
View file

@ -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)