diff options
| author | Kenichi Handa <handa@m17n.org> | 2010-11-01 16:53:08 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2010-11-01 16:53:08 +0900 |
| commit | f6f3366160e26ff5984f287e60616ec9f90acfa3 (patch) | |
| tree | 9f5c8dc73cad6319a8fdf1ab22fd4e9901089e50 /lisp/vc/vc-arch.el | |
| parent | 65b6b59a8030b09d2a32ee88837a061e22751988 (diff) | |
| parent | ca7c89d8f52b34f694031f496600f949640ff9c4 (diff) | |
| download | emacs-f6f3366160e26ff5984f287e60616ec9f90acfa3.tar.gz emacs-f6f3366160e26ff5984f287e60616ec9f90acfa3.tar.bz2 emacs-f6f3366160e26ff5984f287e60616ec9f90acfa3.zip | |
merge trunk
Diffstat (limited to 'lisp/vc/vc-arch.el')
| -rw-r--r-- | lisp/vc/vc-arch.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el index 3ca9d59e3c1..ba91f7f23c6 100644 --- a/lisp/vc/vc-arch.el +++ b/lisp/vc/vc-arch.el @@ -428,7 +428,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see (message "There are unresolved conflicts in %s" (file-name-nondirectory rej)))))) -(defun vc-arch-checkin (files rev comment &optional extra-args-ignored) +(defun vc-arch-checkin (files rev comment) (if rev (error "Committing to a specific revision is unsupported")) ;; FIXME: This implementation probably only works for singleton filesets (let ((summary (file-relative-name (car files) (vc-arch-root (car files))))) |