project-navigation
Personal tools

Author Topic: Svn issues  (Read 1480 times)

Offline keybounce

  • Sergeant
  • *****
  • Posts: 330
    • View Profile
Svn issues
« on: May 25, 2010, 06:45:52 pm »
I need help understanding what svn is/is not doing.

Going from 29998 to 30030 on the 2.3 branch gives me lots of U's.

One machine compiles all of those U's.
One machine compiles only some of those U's.

Both are running the same OS (Mac 10.5.8, PPC).
Both are using svn 1.4.4

Trying to ''svn diff" gives me lots of things like:
Property changes on: src/tools/radiant/libs/entity/angle.h
___________________________________________________________________
Name: svn:mergeinfo
   - /ufoai/trunk/src/tools/radiant/libs/entity/angle.h:29956,29958,29972-29973,
29978,29992
   + /ufoai/trunk/src/tools/radiant/libs/entity/angle.h:29956,29958,29972-29973,
29978,29992,30004,30008,30012,30026-30028

but no clear indication of the code changes, nor do I see any way to only show the code changes.

Here's what the two machines look like when trying to upgrade:
Code: [Select]
stbmac:23 Michael$ svn info
Path: .
URL: https://ufoai.svn.sourceforge.net/svnroot/ufoai/ufoai/branches/ufoai_2.3
Repository Root: https://ufoai.svn.sourceforge.net/svnroot/ufoai
Repository UUID: 39b98707-f80d-0410-bc7e-c6b02f5409da
Revision: 29998
Node Kind: directory
Schedule: normal
Last Changed Author: tlh2000
Last Changed Rev: 29993
Last Changed Date: 2010-05-15 10:17:08 -0700 (Sat, 15 May 2010)

stbmac:23 Michael$ svn st
?      port-readme.txt
?      tags
M      Makefile.in
M      src/ports/unix/unix_main.c
?      build/local.mk
M      build/maps.mk
stbmac:23 Michael$ svn up -r 30030
 U   src/tools/radiant/radiant/vfs.cpp
 U   src/tools/radiant/radiant/archivezip.cpp
 U   src/tools/radiant/radiant/entitymodule.cpp
 U   src/tools/radiant/radiant/shaders.cpp
 U   src/tools/radiant/radiant/map/parse.h
 U   src/tools/radiant/radiant/map/write.h
 U   src/tools/radiant/radiant/map/mapmodule.cpp
 U   src/tools/radiant/radiant/map/parse.cpp
 U   src/tools/radiant/radiant/map/write.cpp
 U   src/tools/radiant/radiant/vfs.h
 U   src/tools/radiant/radiant/imagemodules.cpp
 U   src/tools/radiant/libs/archivedir/archive.cpp
 U   src/tools/radiant/libs/archivedir/archive.h
 U   src/tools/radiant/libs/archivedir/fs_path.h
 U   src/tools/radiant/libs/archivezip/fs_filesystem.h
 U   src/tools/radiant/libs/archivezip/zlibstream.h
 U   src/tools/radiant/libs/archivezip/pkzip.h
 U   src/tools/radiant/libs/archivezip/ZipArchive.cpp
 U   src/tools/radiant/libs/archivezip/ZipArchive.h
 U   src/tools/radiant/libs/shaders/shaders.h
 U   src/tools/radiant/libs/shaders/shaders.cpp
 U   src/tools/radiant/libs/entity/arrow.h
 U   src/tools/radiant/libs/entity/eclassmodel.h
 U   src/tools/radiant/libs/entity/group.h
 U   src/tools/radiant/libs/entity/miscsound.cpp
 U   src/tools/radiant/libs/entity/model.h
 U   src/tools/radiant/libs/entity/light.cpp
 U   src/tools/radiant/libs/entity/colour.h
 U   src/tools/radiant/libs/entity/filters.cpp
 U   src/tools/radiant/libs/entity/miscsound.h
 U   src/tools/radiant/libs/entity/targetable.cpp
 U   src/tools/radiant/libs/entity/miscmodel.cpp
 U   src/tools/radiant/libs/entity/light.h
 U   src/tools/radiant/libs/entity/entity.cpp
 U   src/tools/radiant/libs/entity/generic.cpp
 U   src/tools/radiant/libs/entity/filters.h
 U   src/tools/radiant/libs/entity/angles.h
 U   src/tools/radiant/libs/entity/miscparticle.cpp
 U   src/tools/radiant/libs/entity/targetable.h
 U   src/tools/radiant/libs/entity/generic.h
 U   src/tools/radiant/libs/entity/entity.h
 U   src/tools/radiant/libs/entity/miscmodel.h
 U   src/tools/radiant/libs/entity/namekeys.h
 U   src/tools/radiant/libs/entity/miscparticle.h
 U   src/tools/radiant/libs/entity/namedentity.h
 U   src/tools/radiant/libs/entity/keyobservers.h
 U   src/tools/radiant/libs/entity/curve.h
 U   src/tools/radiant/libs/entity/eclassmodel.cpp
 U   src/tools/radiant/libs/entity/angle.h
 U   src/tools/radiant/libs/entity/group.cpp
 U   src/tools/radiant/libs/entity/origin.h
 U   src/tools/radiant/libs/entity/scale.h
 U   src/tools/ufo2map/check/check.h
 U   src/tools/ufo2map/check/check.c
 U   src/tools/ufo2map
 U   src/server
 U   src/shared
 U   src/ports
 U   src/common
 U   src/game
 U   src/client/campaign/cp_aliencont.c
 U   src/client/campaign/cp_campaign.c
 U   src/client/campaign/cp_base.h
 U   src/client/campaign/cp_aliencont.h
 U   src/client/campaign/cp_market.c
 U   src/client/campaign/cp_campaign.h
 U   src/client/campaign/cp_market.h
 U   src/client/campaign/cp_radar.c
 U   src/client/campaign/cp_ufopedia.c
 U   src/client/campaign/cp_airfight.c
 U   src/client/campaign/cp_radar.h
 U   src/client/campaign/cp_messageoptions.c
 U   src/client/campaign/cp_installation.c
 U   src/client/campaign/cp_ufopedia.h
 U   src/client/campaign/cp_airfight.h
 U   src/client/campaign/cp_fightequip_callbacks.c
 U   src/client/campaign/cp_messageoptions.h
 U   src/client/campaign/cp_installation.h
 U   src/client/campaign/cp_uforecovery.c
 U   src/client/campaign/cp_fightequip_callbacks.h
 U   src/client/campaign/cp_uforecovery.h
 U   src/client/campaign/cp_map.c
 U   src/client/campaign/cp_map.h
 U   src/client/campaign/cp_research_callbacks.c
U    src/client/campaign/cp_aircraft.c
 U   src/client/campaign/cp_research_callbacks.h
 U   src/client/campaign/cp_aliencont_callbacks.c
 U   src/client/campaign/cp_employee.c
 U   src/client/campaign/cp_aliencont_callbacks.h
 U   src/client/campaign/cp_transfer.c
 U   src/client/campaign/cp_employee.h
 U   src/client/campaign/cp_ufo.c
 U   src/client/campaign/cp_transfer.h
 U   src/client/campaign/cp_save.c
 U   src/client/campaign/cp_ufo.h
 U   src/client/campaign/cp_messageoptions_callbacks.c
 U   src/client/campaign/cp_produce_callbacks.c
 U   src/client/campaign/cp_produce.c
U    src/client/campaign/missions/cp_mission_baseattack.c
 U   src/client/campaign/cp_save.h
 U   src/client/campaign/cp_messageoptions_callbacks.h
 U   src/client/campaign/cp_produce_callbacks.h
 U   src/client/campaign/cp_produce.h
 U   src/client/campaign/cp_uforecovery_callbacks.c
 U   src/client/campaign/cp_uforecovery_callbacks.h
 U   src/client/campaign/cp_event.c
 U   src/client/campaign/cp_alienbase.c
 U   src/client/campaign/cp_event.h
 U   src/client/campaign/cp_nation.c
 U   src/client/campaign/cp_alienbase.h
 U   src/client/campaign/cp_research.c
 U   src/client/campaign/cp_nation.h
 U   src/client/campaign/cp_research.h
 U   src/client/campaign/cp_popup.c
 U   src/client/campaign/cp_mapfightequip.c
 U   src/client/campaign/cp_popup.h
 U   src/client/campaign/cp_mapfightequip.h
 U   src/client/campaign/cp_base.c
 U   src/client/sound/s_music.c
 U   src/client/sound/s_main.c
 U   src/client/sound/s_music.h
 U   src/client/sound/s_main.h
 U   src/client/menu/m_windows.c
 U   src/client/menu/m_windows.h
 U   src/client/menu/m_internal.h
 U   src/client/menu/node/m_node_spinner.c
 U   src/client/menu/node/m_node_base.h
 U   src/client/menu/node/m_node_special.c
 U   src/client/menu/node/m_node_container.c
 U   src/client/menu/node/m_node_spinner.h
 U   src/client/menu/node/m_node_text.c
 U   src/client/menu/node/m_node_special.h
 U   src/client/menu/node/m_node_checkbox.c
 U   src/client/menu/node/m_node_container.h
 U   src/client/menu/node/m_node_text.h
 U   src/client/menu/node/m_node_checkbox.h
 U   src/client/menu/node/m_node_window.c
 U   src/client/menu/node/m_node_linechart.c
 U   src/client/menu/node/m_node_vscrollbar.c
 U   src/client/menu/node/m_node_window.h
 U   src/client/menu/node/m_node_linechart.h
 U   src/client/menu/node/m_node_vscrollbar.h
 U   src/client/menu/node/m_node_image.c
 U   src/client/menu/node/m_node_image.h
 U   src/client/menu/node/m_node_optiontree.c
 U   src/client/menu/node/m_node_optiontree.h
 U   src/client/menu/node/m_node_item.c
 U   src/client/menu/node/m_node_abstractvalue.c
 U   src/client/menu/node/m_node_item.h
 U   src/client/menu/node/m_node_bar.c
 U   src/client/menu/node/m_node_optionlist.c
 U   src/client/menu/node/m_node_abstractvalue.h
 U   src/client/menu/node/m_node_tab.c
 U   src/client/menu/node/m_node_abstractscrollbar.c
 U   src/client/menu/node/m_node_bar.h
 U   src/client/menu/node/m_node_optionlist.h
 U   src/client/menu/node/m_node_zone.c
 U   src/client/menu/node/m_node_tab.h
 U   src/client/menu/node/m_node_button.c
 U   src/client/menu/node/m_node_abstractscrollbar.h
 U   src/client/menu/node/m_node_map.c
 U   src/client/menu/node/m_node_zone.h
 U   src/client/menu/node/m_node_button.h
 U   src/client/menu/node/m_node_map.h
 U   src/client/menu/node/m_node_tbar.c
 U   src/client/menu/node/m_node_selectbox.c
 U   src/client/menu/node/m_node_cinematic.c
 U   src/client/menu/node/m_node_abstractoption.c
 U   src/client/menu/node/m_node_tbar.h
 U   src/client/menu/node/m_node_selectbox.h
 U   src/client/menu/node/m_node_cinematic.h
 U   src/client/menu/node/m_node_abstractoption.h
 U   src/client/menu/node/m_node_controls.c
 U   src/client/menu/node/m_node_controls.h
 U   src/client/menu/node/m_node_radar.c
 U   src/client/menu/node/m_node_radar.h
 U   src/client/menu/node/m_node_panel.c
 U   src/client/menu/node/m_node_model.c
 U   src/client/menu/node/m_node_panel.h
 U   src/client/menu/node/m_node_model.h
 U   src/client/menu/node/m_node_custombutton.c
 U   src/client/menu/node/m_node_string.c
 U   src/client/menu/node/m_node_textentry.c
 U   src/client/menu/node/m_node_base.c
 U   src/client/menu/node/m_node_custombutton.h
 U   src/client/menu/node/m_node_string.h
 U   src/client/menu/node/m_node_textentry.h
U    src/client/renderer/r_sphere.c
U    src/client/renderer/r_program.c
 U   src/client/renderer
 U   src/client/battlescape/events/e_parse.c
 U   src/client/battlescape/events/e_time.c
 U   src/client/battlescape/events/e_parse.h
 U   src/client/battlescape/events/e_time.h
 U   src/client
 U   contrib/installer/windows/uforadiant.nsi
 U   contrib/installer/windows/ufoai.nsi
 U   base/models/objects/alien/wormhole/cable.md2
 U   base/models/objects/alien/wormhole/cable.png
U    base/models/objects/vegi/palm_a/palm1.md2
U    base/shaders/world_fs.glsl
U    base/shaders/bump_vs.glsl
U    base/pics/hud/bar_teammember.png
U    base/pics/hud/bar_floor.png
 U   base/maps/forest/fr_craft_drop_herakles.map
U    base/maps/tropic/tr_craft_ufo_fighter.map
U    base/maps/tropic/tr_craft_ufo_scout.map
U    base/maps/tropic/tr_craft_crash_fighter.map
U    base/maps/tropic/tr_f03.map
U    base/maps/tropic/tr_f04.map
U    base/maps/tropic/tr_f05.map
U    base/maps/tropic/tr_f06.map
U    base/maps/tropic/tr_craft_ufo_harvester.map
U    base/maps/tropic/tr_f07.map
U    base/maps/tropic/tr_craft_crash_scout.map
U    base/ufos/ui/hud.ufo
 U   .
Updated to revision 30030.
Both machines give the same output here -- both the mac mini and the ibook.

But the compile afterwards differs:
Code: [Select]
stbmac:23 Michael$ make
 * [UFO] src/client/campaign/cp_aircraft.c
 * [UFO] src/client/campaign/cp_base.c
 * [UFO] src/client/campaign/cp_campaign.c
 * [UFO] src/client/campaign/cp_research.c
 * [UFO] src/client/campaign/cp_ufopedia.c
 * [UFO] src/client/campaign/missions/cp_mission_baseattack.c
 * [UFO] src/client/renderer/r_program.c
 * [UFO] src/client/renderer/r_sphere.c
 * [UFO] ... linking -rdynamic (-L/opt/local/lib -lvorbis -lm -logg       -lz  -lcurl -lssl -lcrypto -lz -ljpeg  -L/opt/local/lib -lpng12 -lz   -L/opt/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa -lSDL_image  -lSDL_mixer  -lSDL_ttf  -logg  -lxvidcore  -L/opt/local/lib -ltheora -logg   -lintl -lxvidcore  -framework OpenGL -L/opt/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa)
CFLAGS
-----------------------
-I/opt/local/include -arch i386 -arch ppc -DUFO_REVISION="30030M" -D_BSD_SOURCE -D_XOPEN_SOURCE -DSHARED_EXT="dylib" -DHAVE_CONFIG_H -DUSE_SIGNALS=0 -Wall -pipe -Winline -Wcast-qual -Wcast-align -Wdeclaration-after-statement -Wmissing-prototypes -Wmissing-declarations -std=c99 -ggdb -O0 -DDEBUG -fno-inline -DLUA_USE_APICHECK
-DCOMPILE_UFO -I/opt/local/include/SDL -D_GNU_SOURCE=1 -D_THREAD_SAFE
-arch i386 -arch ppc -Isrc/tools/radiant/libs -Isrc/tools/radiant/include

LDFLAGS
-----------------------
-L/opt/local/lib -arch i386 -arch ppc -framework IOKit -framework Foundation -framework Cocoa
-L/opt/local/lib -lvorbis -lm -logg -lz -lcurl -lssl -lcrypto -lz -ljpeg -L/opt/local/lib -lpng12 -lz -L/opt/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa -lSDL_image -lSDL_mixer -lSDL_ttf -logg -lxvidcore -L/opt/local/lib -ltheora -logg -lintl -lxvidcore -framework OpenGL -L/opt/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa
-arch i386 -arch ppc -headerpad_max_install_names -lgthread-2.0 -lvorbisfile -lvorbis -logg

Gettext
-----------------------
Type 'make lang' to compile the gettext translation files.

Maps
-----------------------
Execute 'contrib/scripts/map-get.py upgrade' to download the maps
This is e.g. needed if you want to play multiplayer games and the
checksums of your maps have to match with the ones from your
opponents - or just type 'make maps' to compile the maps

PAK files
-----------------------
Type 'make pk3' to assemble the pk3 files

Installation
-----------------------
Version 2.3-dev
Install data into /usr/local/share/ufoai
Install libs into /usr/local/lib/ufoai
Install translations into /usr/local/share/locale
Install binaries into /usr/local/bin

Built for debug-darwin-universal
stbmac:23 Michael$
That's the complete output -- no snippage -- for the mac mini.

The ibook, not building universal, has this:

Code: [Select]
Kleiman-ibook:23 michael$ make
 * [UFO] src/client/cl_console.c
 * [UFO] src/client/cl_game.c
 * [UFO] src/client/cl_game_campaign.c
 * [UFO] src/client/cl_game_multiplayer.c
 * [UFO] src/client/cl_game_skirmish.c
 * [UFO] src/client/cl_http.c
 * [UFO] src/client/cl_inventory.c
 * [UFO] src/client/cl_inventory_callbacks.c
 * [UFO] src/client/cl_irc.c
<snip>
 * [UFO] src/client/campaign/cp_aircraft.c
 * [UFO] src/client/campaign/cp_aircraft_callbacks.c
 * [UFO] src/client/campaign/cp_alien_interest.c
 * [UFO] src/client/campaign/cp_base.c
 * [UFO] src/client/campaign/cp_base_callbacks.c
 * [UFO] src/client/campaign/cp_basedefence_callbacks.c
 * [UFO] src/client/campaign/cp_hospital.c
 * [UFO] src/client/campaign/cp_hospital_callbacks.c
 * [UFO] src/client/campaign/cp_messages.c
 * [UFO] src/client/campaign/cp_missions.c
 * [UFO] src/client/campaign/cp_mission_triggers.c
 * [UFO] src/client/campaign/cp_nations.c
 * [UFO] src/client/campaign/cp_parse.c
 * [UFO] src/client/campaign/cp_rank.c
 * [UFO] src/client/campaign/cp_team.c
 * [UFO] src/client/campaign/cp_team_callbacks.c
 * [UFO] src/client/campaign/cp_time.c
 * [UFO] src/client/campaign/cp_xvi.c
 * [UFO] src/client/campaign/cp_alienbase.c
 * [UFO] src/client/campaign/cp_aliencont.c
 * [UFO] src/client/campaign/cp_aliencont_callbacks.c
 * [UFO] src/client/campaign/cp_airfight.c
 * [UFO] src/client/campaign/cp_campaign.c
 * [UFO] src/client/campaign/cp_event.c
 * [UFO] src/client/campaign/cp_employee.c
 * [UFO] src/client/campaign/cp_employee_callbacks.c
 * [UFO] src/client/campaign/cp_installation.c
 * [UFO] src/client/campaign/cp_installation_callbacks.c
 * [UFO] src/client/campaign/cp_market.c
 * [UFO] src/client/campaign/cp_market_callbacks.c
 * [UFO] src/client/campaign/cp_map.c
 * [UFO] src/client/campaign/cp_mapfightequip.c
 * [UFO] src/client/campaign/cp_nation.c
 * [UFO] src/client/campaign/cp_produce.c
 * [UFO] src/client/campaign/cp_produce_callbacks.c
 * [UFO] src/client/campaign/cp_radar.c
 * [UFO] src/client/campaign/cp_research.c
 * [UFO] src/client/campaign/cp_research_callbacks.c
 * [UFO] src/client/campaign/cp_save.c
 * [UFO] src/client/campaign/cp_transfer.c
 * [UFO] src/client/campaign/cp_transfer_callbacks.c
 * [UFO] src/client/campaign/cp_ufo.c
 * [UFO] src/client/campaign/cp_ufopedia.c
 * [UFO] src/client/campaign/cp_uforecovery.c
 * [UFO] src/client/campaign/cp_uforecovery_callbacks.c
 * [UFO] src/client/campaign/cp_messageoptions.c
 * [UFO] src/client/campaign/cp_messageoptions_callbacks.c
 * [UFO] src/client/campaign/cp_popup.c
 * [UFO] src/client/campaign/cp_fightequip_callbacks.c
<snip>
 * [UFO] src/client/menu/node/m_node_window.c
 * [UFO] src/client/renderer/r_program.c
 * [UFO] src/client/renderer/r_sphere.c
 * [UFO] ... linking -rdynamic (-L/opt/local/lib -lvorbis -lm -logg       -lz  -L/opt/local/lib -lcurl -L/opt/local/lib -L/opt/local/lib -L/opt/local/lib -lidn -lssl -lcrypto -lssl -lcrypto -lz -lz -ljpeg  -L/opt/local/lib -lpng12 -lz   -L/opt/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa -lSDL_image  -lSDL_mixer  -lSDL_ttf  -logg  -lxvidcore  -L/opt/local/lib -ltheora -logg   -lintl -lxvidcore  -framework OpenGL -L/opt/local/lib -lSDLmain -lSDL -Wl,-framework,Cocoa)
<snip>

Can anyone help me understand this?