On 2011-04-29, at 10:57 AM, Bradley Lucier wrote:

With the following commands:

      265	10:51	tar zxf gambc-v4_6_1-devel.tgz
      266	10:52	cd gambc-v4_6_1-devel
      267	10:52	./configure CC='gcc-4.5 -march=native' --enable-multiple-versions
      268	10:52	./configure CC='gcc-4.5 -march=native' --enable-multiple-versions --enable-single-host
      269	10:52	make -j 4
      270	10:54	make update

I get the following results:

   heine:~/programs/gambc-v4_6_1-devel> make update
   From http://www.iro.umontreal.ca/~gambit/repo/gambit
      431c27a..2f2e6ae  master     -> origin/master
   Updating f91139f..2f2e6ae
   error: Untracked working tree file 'examples/iOS/Prefix.pch' would be overwritten by merge.  Aborting
   D	.gitattributes
   Already on 'master'
   Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
   make

Yes, this is the problem with "make update"... a past error in the repository can't be "taken back". In this case the file examples/iOS/Prefix.pch was *not* under git control (this was an error), and now it has been put under git control (as it should). But the "git pull" that "make update" performs does not want to proceed because the file examples/iOS/Prefix.pch would be clobbered.

How can I implement the "make update" so that it tolerates problems in future commits to the repository? It is not easy to predict the future!

Quick and dirty fix:

rm examples/iOS/Prefix.pch make update

Marc