Hi,
>BTW, this was also my first use of darcs. I quite enjoy it and
>appreciate its interactive mode.
Grmpf. Now I discovered dacs --pull to update my local repository and of
course, there was a conflict and darcs got really confused, or so I believe.
Question 1: how would you like me to send patches? As a single large file
(darcs send -o joerg.diff), or as a collection of the half-dozen darcs records
that I used (with what command)?
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.
Even the local _darcs/current/src/types.lisp confused me since I believed that
would reflect the newest remote content, but it contains a merge of remote and
my local records -- somehow, without the conflict marker I get to se in the
working directory.
Any advice on how I should proceed from there on?
Obviously, any new tool needs mastering & experience to cope with.
Unrecord, unpull, rollback, amend-record and revert (or rather, their manpage)
are still confusing me.
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.
Regards,
Jorg Hohle.
_______________________________________________
cffi-devel mailing list
cffi-devel@common-lisp.net
http://common-lisp.net/cgi-bin/mailman/listinfo/cffi-devel
