"Hoehle, Joerg-Cyril" <[EMAIL PROTECTED]> writes: > Question 2: The conflict occured in src/types.lisp where I had > modified defctype. The change is completely superfluous now. But > it's not until I went to the online repository that I understood that > defctype was not at the bottom of the file but had moved up and was > completely transformed.
Oh yes, types.lisp *finally* went through a rewrite recently. > I disliked darcs pull --verbose not telling me what patch introduced > the conflict. At the end, it just said: We have conflicts in the > following files: src/types.lisp I believe it could have been more > precise, and name the patch. Never had any conflicts with darcs yet. :-) Good luck with that! -- Luís Oliveira luismbo (@) gmail (.) com Equipa Portuguesa do Translation Project http://www.iro.umontreal.ca/translation/registry.cgi?team=pt _______________________________________________ cffi-devel mailing list cffi-devel@common-lisp.net http://common-lisp.net/cgi-bin/mailman/listinfo/cffi-devel
