Mercurial > emacs
comparison lisp/vc.el @ 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 |
comparison
equal
deleted
inserted
replaced
| 94534:37fa7ba3820c | 94535:c0d96bdee441 |
|---|---|
| 1618 ;; Verify that the fileset is homogeneous | 1618 ;; Verify that the fileset is homogeneous |
| 1619 (dolist (file (cdr only-files)) | 1619 (dolist (file (cdr only-files)) |
| 1620 ;; Ignore directories, they are compatible with anything. | 1620 ;; Ignore directories, they are compatible with anything. |
| 1621 (unless (file-directory-p file) | 1621 (unless (file-directory-p file) |
| 1622 (unless (vc-compatible-state (vc-state file) state) | 1622 (unless (vc-compatible-state (vc-state file) state) |
| 1623 (error "Fileset is in a mixed-up state %s %s" state (vc-state file))) | 1623 (error "%s:%s clashes with %s:%s" |
| 1624 file (vc-state file) (car files) state)) | |
| 1624 (unless (eq (vc-checkout-model backend file) model) | 1625 (unless (eq (vc-checkout-model backend file) model) |
| 1625 (error "Fileset has mixed checkout models")))) | 1626 (error "Fileset has mixed checkout models")))) |
| 1626 ;; Check for buffers in the fileset not matching the on-disk contents. | 1627 ;; Check for buffers in the fileset not matching the on-disk contents. |
| 1627 (dolist (file files) | 1628 (dolist (file files) |
| 1628 (let ((visited (get-file-buffer file))) | 1629 (let ((visited (get-file-buffer file))) |