Hello,

I presume the automake developers track the CVS tree and 
frequently build new versions of automake for testing.
Could you let us in on the secret to minimizing the following
annoyance?

The CVS tree includes things like Makefile.in.  But this file
is also generated from Makefile.am when I build automake.
The next time I do "cvs update", I get a conflict because
of stupid changes like:


steve@riemann{automake-cvs}head Makefile.in
<<<<<<< Makefile.in
# Makefile.in generated automatically by automake 1.4i from Makefile.am.
=======
# Makefile.in generated automatically by automake 1.5a from Makefile.am.
>>>>>>> 1.338


I normally end up removing the file, running cvs update again,
then rebuilding.  What do the rest of you do?

-Steve


-- 
by Rocket to the Moon,
by Airplane to the Rocket,
by Taxi to the Airport,
by Frontdoor to the Taxi,
by throwing back the blanket and laying down the legs ...
- They Might Be Giants


Reply via email to