On Fri, 11 Feb 2000, Allan Rae wrote:
> You're a developer! You have autoconf and automake installed why not
> libtool as well? I think Lars has been been spoiling you.
>
> Why do we need libtool in the repository? Sure it's got to be included in
> the dist but it doesn't need to be in the repository for that to happen.
While I'm on the subject while is acinclude.m4 in the repository? We
build it with autogen.sh and noone should be editting it anyway. Is this
just that someone forgot to do a: cvs rm acinclude?
It'd be one less file to give irrelevent conflicts on. Irrelevent in
the sense that I hadn't modified it locally but cvs still says there are
conflicts -- just like in 89 other files only 8 of which were relevent!
As you can probably guess I'm merging the latest HEAD into my branch.
Why is it that:
cvs update -j sigc-3 -j HEAD
removes all the new files I had in my branch? It's supposed to be merging
the differences not just replacing everything with HEAD which is exactly
what it did do! I'm sure I never had these problems when I was doing the
sgi-stl stuff and used exactly the same form of the update command.
When I instead use:
cvs update -j HEAD
I get 89 files having clashes even though only 8 of them have actually
been modified in my branch all the rest are still as they were on the main
trunk. whinge, whinge, whinge... Rather than just copy the new files
across I went through the exercise of merging them by hand (AARRRGGGHHH!)
which was fun while it lasted but now that I've stopped I don't think I'd
ever do that again. (Like thumping your head against a brick wall -- it
doesn't hurt till you stop. Don't believe me? Try it!) I did cheat for
the po files though.
I've got this compiling now (on a P100 this will take forever) and will
commit it sometime after it successfully works... maybe even tomorrow ;-)
I can certainly see why Lars does all his development in the main trunk.
Allan. (ARRae)
