Author: mhenoch Date: Thu Aug 31 20:22:35 2006 New Revision: 39 Modified: cl-darcs/trunk/apply-patch.lisp Log: Make binary patch non-match a continuable error Modified: cl-darcs/trunk/apply-patch.lisp ============================================================================== --- cl-darcs/trunk/apply-patch.lisp (original) +++ cl-darcs/trunk/apply-patch.lisp Thu Aug 31 20:22:35 2006 @@ -120,7 +120,8 @@ :element-type '(unsigned-byte 8)))) (read-sequence bytes in) (not (equalp bytes (binary-oldhex patch))))) - (error "Contents of ~A don't match patch." file))) + (cerror "Write new contents to ~A anyway." + "Contents of ~A don't match patch." file))) ;; Overwrite with new content. (with-open-file (out file :direction :output :if-exists :supersede