diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-16 18:08:22 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-16 18:08:22 -0400 |
| commit | 78be8b64657aeca0472d708450ea1ce2bc142606 (patch) | |
| tree | dccbdc45e747a47b44be92abab79cca15a30111f /admin/bzrmerge.el | |
| parent | 6615748ac6bcff258ef548f70bdcc1ab9f740472 (diff) | |
| parent | 67ed8fcd04edeff2d4931acf476e7067c5ceeef2 (diff) | |
| download | emacs-78be8b64657aeca0472d708450ea1ce2bc142606.tar.gz | |
Merge from emacs-24
Diffstat (limited to 'admin/bzrmerge.el')
| -rw-r--r-- | admin/bzrmerge.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index 4fa328b9d6d..42d39d3071a 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el @@ -50,7 +50,7 @@ The list returned is sorted by oldest-first." (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")) + (user-error "You still have unresolved conflicts")) (let ((merges ()) found) (if (not (re-search-forward "^pending merges:\n" nil t)) @@ -62,7 +62,7 @@ The list returned is sorted by oldest-first." (setq found (not (equal "unknown" (match-string 1))))))) found) - (error "You still have uncommitted changes")) + (user-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 ;; find is the "pending merges" from "bzr status -v", which is not @@ -171,7 +171,7 @@ Type `y' to skip this revision, (enable-local-eval nil)) (find-file-noselect file)) (if (buffer-modified-p) - (error "Unsaved changes in %s" (current-buffer))) + (user-error "Unsaved changes in %s" (current-buffer))) (save-excursion (cond ((derived-mode-p 'change-log-mode) @@ -323,7 +323,7 @@ Does not make other difference." BEWARE! Important metadata is kept in this Emacs session! Do not commit without re-running `M-x bzrmerge' first!" :warning bzrmerge-warning-buffer)) - (error "Resolve conflicts manually"))))) + (user-error "Resolve conflicts manually"))))) (cons merge skip))))) (defun bzrmerge (from) |