screen shows defeat while stats say victory

[ligtvoet]

I regularly update the files, it says however 2.4-dev AI-32 28 Feb.
Anyway, running on Linux 12.04

When running a battle in auto-mode, I regularly get a defeat screen while the statistics say that 8 aliens were killed, and 8 soldiers and civilians survived.

[kurja]

I regularly update the files, it says however 2.4-dev AI-32 28 Feb.
Anyway, running on Linux 12.04

you won't get from 2.4dev to 2.4 release by update/upgrade, you need to uninstall and then reinstall the new version or if you want 2.5dev you have to compile it.

[geever]

And that bug was fixed since February...

-geever

[ligtvoet]

So I did a fresh git fetch and still I get the 28 Feb version. What do I do wrong?

[H-Hour]

Sorry for stupid question: are you recompiling after you get the new files?

[H-Hour]

Another stupid question: are you rebasing after you fetch?

[ligtvoet]

This is what I do:

git fetch
./configure
make clean
make
make lang
python ./contrib/map-get/update.py
./ufo

[H-Hour]

After git fetch, I think you also need to git upbase or git rebase. Otherwise you are downloading the files but not actually applying the changes to your working folder.

[Jon_dArc]

In at least some circumstances git fetch will also check out the revision containing the newly fetched files (it's always done that for me, thus far), but that would probably be a good place to start looking.

~J

[Sandro]

Proper way is to use "git pull --rebase" instead of "git fetch".
For those who like hypnotizing the progress bars, "--progress" could be added.

[kurja]

exactly what does rebasing achieve? if not using any mods or branches, does it do anything?

[geever]

if you don't commit anything it does nothing afaik. But the best is imho setting up an alias:

Code: [Select]

git config alias.up "pull --rebase"

So you only have to type git up as it was an SVN, and still cared about accidental merge-commits.

-geever

[Jon_dArc]

Proper way is to use "git pull --rebase" instead of "git fetch".

Hah, I'm a dumbass. Yes, "git pull" is what I've been using, not "git fetch", ignore my previous comment. I have not found it necessary to use the --rebase flag, despite having local commits and branches.

~J