Mercurial > emacs

comparison admin/bzrmerge.el @ 112194:978fe18f0882

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* admin/bzrmerge.el: Standardize copyright and license headers.
author Glenn Morris <rgm@gnu.org>
date Tue, 11 Jan 2011 20:28:12 -0800
parents b0a317b18658
children 1fd3710e6845
comparison
equal deleted inserted replaced
112193:700b890dcfb5 112194:978fe18f0882
1 ;;; bzrmerge.el --- 1 ;;; bzrmerge.el ---
2 2
3 ;; Copyright (C) 2010 Stefan Monnier 3 ;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
4 4
5 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> 5 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
6 ;; Keywords: 6 ;; Keywords:
7 7
8 ;; This program is free software; you can redistribute it and/or modify 8 ;; GNU Emacs is free software: you can redistribute it and/or modify
9 ;; it under the terms of the GNU General Public License as published by 9 ;; it under the terms of the GNU General Public License as published by
10 ;; the Free Software Foundation, either version 3 of the License, or 10 ;; the Free Software Foundation, either version 3 of the License, or
11 ;; (at your option) any later version. 11 ;; (at your option) any later version.
12 12
13 ;; This program is distributed in the hope that it will be useful, 13 ;; GNU Emacs is distributed in the hope that it will be useful,
14 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of 14 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
15 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 ;; GNU General Public License for more details. 16 ;; GNU General Public License for more details.
17 17
18 ;; You should have received a copy of the GNU General Public License 18 ;; You should have received a copy of the GNU General Public License
19 ;; along with this program. If not, see <http://www.gnu.org/licenses/>. 19 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
20 20
21 ;;; Commentary: 21 ;;; Commentary:
22 22
23 ;; 23 ;;
24 24
200 (call-process "bzr" nil t nil "revert") 200 (call-process "bzr" nil t nil "revert")
201 (call-process "bzr" nil t nil 201 (call-process "bzr" nil t nil
202 "merge" "-r" (format "%s" endrevno) from) 202 "merge" "-r" (format "%s" endrevno) from)
203 (call-process "bzr" nil t nil "revert" ".") 203 (call-process "bzr" nil t nil "revert" ".")
204 (call-process "bzr" nil t nil "unshelve"))) 204 (call-process "bzr" nil t nil "unshelve")))
205 205
206 (defvar bzrmerge-already-done nil) 206 (defvar bzrmerge-already-done nil)
207 207
208 (defun bzrmerge-apply (missing from) 208 (defun bzrmerge-apply (missing from)
209 (setq from (expand-file-name from)) 209 (setq from (expand-file-name from))
210 (with-current-buffer (get-buffer-create "*bzrmerge*") 210 (with-current-buffer (get-buffer-create "*bzrmerge*")