+- Xonotic Forums (https://forums.xonotic.org)
+-- Forum: Support (https://forums.xonotic.org/forumdisplay.php?fid=3)
+--- Forum: Xonotic - Help & Troubleshooting (https://forums.xonotic.org/forumdisplay.php?fid=4)
+--- Thread: [NEED HELP] Stash them! (GIT update warning) (/showthread.php?tid=1255)
Stash them! (GIT update warning) - unfa - 11-25-2010
This is the full outcome, but what's the point is on the very end of it:
Code:
unfa@unfa:~$ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/
unfa@unfa:/media/unfa-Studio/home/unfa/Archiwa/Xonotic$ ./all checkout
+ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/.
+ git checkout master
M misc/builddeps/dp.win32/include/wspiapi.h
M misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers
M misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Resources
M misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/SDL
M misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/Current
M misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libfreetype.dylib
M misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.dylib
M misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libogg.dylib
M misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libtheora.dylib
M misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbis.dylib
M misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisenc.dylib
M misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisfile.dylib
M misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libfreetype.dylib
M misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libmodplug.dylib
M misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libogg.dylib
M misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libtheora.dylib
M misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbis.dylib
M misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisenc.dylib
M misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libvorbisfile.dylib
M xonotic-linux-sdl.sh
Already on 'master'
Your branch is behind 'origin/master' by 414 commits, and can be fast-forwarded.
+ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/data/xonotic-data.pk3dir
+ git checkout master
Already on 'master'
+ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/data/xonotic-maps.pk3dir
+ git checkout master
Already on 'master'
+ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/data/xonotic-music.pk3dir
+ git checkout master
M cdtracks.cfg
M sound/cdtracks/rising-of-the-phoenix.ogg
Already on 'master'
Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded.
+ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/data/xonotic-nexcompat.pk3dir
+ git checkout master
Already on 'master'
+ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/mediasource
+ git checkout master
Already on 'master'
+ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/darkplaces
+ git checkout div0-stable
Already on 'div0-stable'
+ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/fteqcc
+ git checkout master
M pr_x86.c
M qcc.dsp
M qcctui.c
Already on 'master'
+ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/div0-gittools
+ git checkout master
Already on 'master'
+ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/netradiant
+ git checkout master
M tools/quake3/q3map2/branch-manager
Already on 'master'
. is at master
data/xonotic-data.pk3dir is at master
data/xonotic-maps.pk3dir is at master
data/xonotic-music.pk3dir is at master
data/xonotic-nexcompat.pk3dir is at master
mediasource is at master
darkplaces is at div0-stable
fteqcc is at master
div0-gittools is at master
netradiant is at master
unfa@unfa:/media/unfa-Studio/home/unfa/Archiwa/Xonotic$ ./all update
+ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/.
+ git config remote.origin.url git://git.xonotic.org/xonotic/xonotic.git
+ git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
+ git config core.autocrlf input
+ git pull
Updating 55aecf8..30ec289
error: Your local changes to 'misc/builddeps/dp.win32/include/wspiapi.h' would be overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge.
Pulling failed. Press ENTER to continue, or Ctrl-C to abort.I pressed enter and update continues, but I'am afraid it won't be complete. What should I do with this? I didn't do any manual changes to the file 'misc/builddeps/dp.win32/include/wspiapi.h'. I don't know what's up. I just want to update Xonotic, compile it and run.
Now he update finished (with several more warnigs to stash some files), but the compilation failed:
Code:
unfa@unfa:~$ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/unfa@unfa:/media/unfa-Studio/home/unfa/Archiwa/Xonotic$ ./all compile+ cd /media/unfa-Studio/home/unfa/Archiwa/Xonotic/fteqcc
+ make -j2
make USEGUI_CFLAGS="" R_qcc
make[1]: Entering directory `/media/unfa-Studio/home/unfa/Archiwa/Xonotic/fteqcc'
gcc -Wall -ggdb -o fteqcc.bin -O3 -s qccmain.o qcc_pr_comp.o qcc_pr_lex.o qcctui.o comprout.o hash.o qcc_cmdlib.o qcd_main.o
/usr/bin/ld: i386:x86-64 architecture of input file `qccmain.o' is incompatible with i386 output
/usr/bin/ld: i386:x86-64 architecture of input file `qcc_pr_comp.o' is incompatible with i386 output
/usr/bin/ld: i386:x86-64 architecture of input file `qcc_pr_lex.o' is incompatible with i386 output
/usr/bin/ld: i386:x86-64 architecture of input file `qcctui.o' is incompatible with i386 output
/usr/bin/ld: i386:x86-64 architecture of input file `comprout.o' is incompatible with i386 output
/usr/bin/ld: i386:x86-64 architecture of input file `hash.o' is incompatible with i386 output
/usr/bin/ld: i386:x86-64 architecture of input file `qcc_cmdlib.o' is incompatible with i386 output
/usr/bin/ld: i386:x86-64 architecture of input file `qcd_main.o' is incompatible with i386 output
/usr/bin/ld: final link failed: Invalid operation
collect2: ld returned 1 exit status
make[1]: *** [R_qcc] Error 1
make[1]: Leaving directory `/media/unfa-Studio/home/unfa/Archiwa/Xonotic/fteqcc'
make: *** [qcc] Error 2
unfa@unfa:/media/unfa-Studio/home/unfa/Archiwa/Xonotic$I installed all dependencies from here before: http://dev.xonotic.org/projects/xonotic/wiki/Repository_Access
Sorry for bothering you, but I don't know what should I do to make it work. It seems to me that GIT wants to compile only once. When It is compiled already, it always ends up like this.
Could somebody help me out, please?
