procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* admin/bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.

Browse source
This commit is contained in:
Glenn Morris 2012-08-28 15:26:41 -04:00
parent 01e0f0f5d7
commit a3f90bea8e
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
admin/ChangeLog
View file

@ -1,3 +1,7 @@
2012-08-28 Glenn Morris <rgm@gnu.org>
* bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.
2012-08-28 Andreas Schwab <schwab@linux-m68k.org>
* charsets/mule-charsets.el (header): Fix typo.

13
admin/bzrmerge.el
View file

@ -45,16 +45,23 @@ The list returned is sorted by oldest-first."
(erase-buffer)
;; We generally want to make sure we start with a clean tree, but we also
;; want to allow restarts (i.e. with some part of FROM already merged but
;; not yet committed).
;; not yet committed). Unversioned (unknown) files in the tree
;; are also ok.
(call-process "bzr" nil t nil "status" "-v")
(goto-char (point-min))
(when (re-search-forward "^conflicts:\n" nil t)
(error "You still have unresolved conflicts"))
(let ((merges ()))
(let ((merges ())
found)
(if (not (re-search-forward "^pending merges:\n" nil t))
(when (save-excursion
(goto-char (point-min))
(re-search-forward "^[a-z ]*:\n" nil t))
(while (and
(re-search-forward "^\\([a-z ]*\\):\n" nil t)
(not
(setq found
(not (equal "unknown" (match-string 1)))))))
found)
(error "You still have uncommitted changes"))
;; This is really stupid, but it seems there's no easy way to figure
;; out which revisions have been merged already. The only info I can