Importing dasm failed

[Rhialto <rhialto%falu.nl@localhost>]

I tried to import a new and currently maintained (more or less) version
of DASM. This failed with a bunch of conflicts, since apparently dasm
has been in wip before, but then moved to pkgsrc proper (and not
updated since, it seems)

Now it seems I've made a bit of a mess, since cvs now claims it knows
nothing about a directory named dasm. But on the web interface at
http://pkgsrc-wip.cvs.sourceforge.net/viewvc/pkgsrc-wip/wip/dasm/?hideattic=0
I can clearly see that something has happened and my new files are
somehow there anyway.

What to do?

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert    -- You author it, and I'll reader it.
\X/ rhialto/at/xs4all.nl      -- Cetero censeo "authored" delendum esse.

------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev 
_______________________________________________
pkgsrc-wip-discuss mailing list
pkgsrc-wip-discuss%lists.sourceforge.net@localhost
https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-discuss