[Bradley-Luciers-MacBook-Pro:~/programs/gambc-v4_6_4-devel] lucier% make update From http://www.iro.umontreal.ca/~gambit/repo/gambit 8ccd2bd..fd08700 master -> origin/master Updating 15c7390..fd08700 error: Your local changes to the following files would be overwritten by merge: makefile.in prebuilt/remote-connect Please, commit your changes or stash them before you can merge. Aborting M makefile.in M prebuilt/remote-connect Already on 'master' Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded. make
Marc, it's like we're looking over your shoulder downloading your private Gambit repository, hoping it will work.
This is not a good feeling.
Brad
Afficher les réponses par date
On 2012-02-13, at 8:26 PM, Bradley Lucier wrote:
Marc, it's like we're looking over your shoulder downloading your private Gambit repository, hoping it will work.
This is not a good feeling.
Perhaps, but it was inevitable because I had to slightly change the sources to be able to "make release". The old build procedure was using a remote build farm which would fail consistently due to a flaky file system. Now that I have upgraded my notebook computer's hard disk, I have enough space to run VirtualBox locally and do the whole build for a release in about 30 minutes reliably. In the future, you can expect much more regular releases.
Sorry for the inconvenience.
Marc
On Mon, 2012-02-13 at 20:26 -0500, Bradley Lucier wrote:
[Bradley-Luciers-MacBook-Pro:~/programs/gambc-v4_6_4-devel] lucier% make update
8ccd2bd..fd08700 master -> origin/master Updating 15c7390..fd08700 error: Your local changes to the following files would be overwritten by merge: makefile.in prebuilt/remote-connect Please, commit your changes or stash them before you can merge. Aborting M makefile.in M prebuilt/remote-connect Already on 'master' Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded. make
OK, to fix this problem, it appears that
27 11:33 rm makefile.in prebuilt/remote-connect 28 11:33 git pull http://www.iro.umontreal.ca/~gambit/repo/gambit.git 29 11:33 make
will work. And then "make update" doesn't bomb.
-
Bradley Lucier -
Marc Feeley