Chris Seawood wrote:
>
> I'd say 'rm -rf dist security/{nss,coreconf}' and repull since you're
> building in the srcdir.
I figured it out (well, I think I did; I haven't rebuilt yet but
everything that's happened so far is consistent with this hypothesis)...
The 0.9 source tarball had a bunch of 0.9-branch sticky tags in its CVS
directories. Even though I had used -r HEAD (and later -A which I
believe is equivalent) to pull client.mk, client.mk wasn't passing the
equivalent tag when it checked out the other directories.
So what I ended up with was the latest code on all the modules that have
*_CO_TAG already defined in client.mk, but 0.9 branch code for
everything else because of the sticky tags.
My workaround? Set *_CO_TAG to HEAD in client.mk for everything that
doesn't have a CO_TAG already defined. Then make -f client.mk checkout,
and blow away my changes by doing rm client.mk; cvs co -r HEAD
client.mk.
I'll update with definitive information on whether this worked or not :)
Thanks for all the help,
Stuart.
