Mercurial > emacs
changeset 94535:c0d96bdee441
More informative message when a fileset is in a mixed state.
| author | Eric S. Raymond <esr@snark.thyrsus.com> |
|---|---|
| date | Fri, 02 May 2008 03:38:16 +0000 |
| parents | 37fa7ba3820c |
| children | 4482905cde4e |
| files | lisp/ChangeLog lisp/vc.el |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri May 02 03:30:10 2008 +0000 +++ b/lisp/ChangeLog Fri May 02 03:38:16 2008 +0000 @@ -27,6 +27,8 @@ and was somewhat misleading. * vc.el (vc-cvs-delete-file) Don't do a "cvs commit" immediately after removing the file. + * vc.el (vc-next-action): More informative message when a fileset + is in a mixed state. 2008-05-01 Sam Steingold <sds@gnu.org>
--- a/lisp/vc.el Fri May 02 03:30:10 2008 +0000 +++ b/lisp/vc.el Fri May 02 03:38:16 2008 +0000 @@ -1620,7 +1620,8 @@ ;; Ignore directories, they are compatible with anything. (unless (file-directory-p file) (unless (vc-compatible-state (vc-state file) state) - (error "Fileset is in a mixed-up state %s %s" state (vc-state file))) + (error "%s:%s clashes with %s:%s" + file (vc-state file) (car files) state)) (unless (eq (vc-checkout-model backend file) model) (error "Fileset has mixed checkout models")))) ;; Check for buffers in the fileset not matching the on-disk contents.