On Fri, Dec 7, 2012 at 8:14 AM, Kirk, Benjamin (JSC-EG311) <benjamin.kir...@nasa.gov> wrote: > On Dec 7, 2012, at 9:09 AM, Vikram Garg <vikram.v.g...@gmail.com> wrote: > >> I get a lot of conflicts relating to the Makefiles (in the library and >> example codes) whenever I do an svn up. Anyway I can avoid this ? >> >> Thanks. > > This is because of us checking in Makefile.in's which are generated with > slightly different versions of automake that what you have. So long as we > commit generated files this will continue to be an issue. My hope is at some > point we no longer need to commit generated files, but in the meantime what > you can do to make your life easier is > > $ svn revert `find . -name Makefile.in` > $ svn up > > This is safe because any local changes in your Makefile.in's are irrelevant - > the only important changes are those in Makefile.am's.
Is it possible for a file to be in a "checked in but ignored" state in SVN? Obviously we don't want users to see diffs or get conflicts with those files, but the developers need to periodically update them. Also, is it true that if you build libmesh's autotools (./bootstrap) and place those first in your PATH (before /usr/bin) you won't get any diffs in the Makefile.in's? (The assumption being that libmesh's Makefile.in's will always be built with whatever version of the autotools is distributed with libmesh...) Obviously I don't advocate this as a general solution, but it does work around the issue. -- John ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ Libmesh-devel mailing list Libmesh-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/libmesh-devel
