Jason R Thorpe <thorpej@zembu.com> writes:
> Looks like it's the asn.1 library, and yes, I'm a little annoyed that
> assar imported new Heimdal bits but didn't commit any of the required
> changes to the build framework :-/

Mea culpa.  Hacking the build framework into shape took more than I
thought it would.  Sorry about that.  It builds for me right now so I
think everything should be fixed.  I'll take this PR and watch that it
keeps working.

How should I have done this to avoid the delay between importing the
new code on the vendor branch and fixing the build stuff?

I did basically:

cvs import -m 'import of heimdal 0.3a' basesrc/crypto/dist/heimdal HEIMDAL v0-3a
cvs update -j ...
<merge the bits from dist/heimdal>
cvs commit
cd crypto/dist/heimdal && cvs update
< hack and make it build >
cvs commit -m '...'

How can I make cvs just do the merging that it does with `cvs import'
and then be able to hack the rest of the pieces into shape before
comitting the whole thing?

/assar