Re: Importing dasm failed

On Fri, Dec 18, 2009 at 03:12:50PM +0100, Rhialto wrote:
> 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?

Theoretically optimal, but not necessary for wip, is merging the
import to the main version.

'cvs add' like you did is fine.
 Thomas

------------------------------------------------------------------------------
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