[Freeciv-Dev] SVN problems

[Christian Knoke <chrisk@xxxxxxxxx>]

I have to remove to files by hand in order to get a proper svn update.

Christian


chris@karl:~/freeciv/svn/freeciv$ LANG= svn update
svn: Failed to add file 'server/scripting/api_gen.c': object of the same
name already exists
chris@karl:~/freeciv/svn/freeciv$ rm server/scripting/api_gen.c
chris@karl:~/freeciv/svn/freeciv$ LANG= svn update
A  server/scripting/api_gen.c
svn: Failed to add file 'server/scripting/api_gen.h': object of the same
name already exists
chris@karl:~/freeciv/svn/freeciv$ rm server/scripting/api_gen.h
chris@karl:~/freeciv/svn/freeciv$ LANG= svn update
A  server/scripting/api_gen.h
 U server/scripting
U  server/unittools.c
 U server
U  data/default/nations.ruleset
U  data/nation/american.ruleset
U  data/nation/byzantium.ruleset
U  data/nation/turk.ruleset
U  data/nation/southafrican.ruleset
U  data/nation/inuit.ruleset
U  data/nation/swazi.ruleset
U  data/nation/colombian.ruleset
A  data/nation/westphalian.ruleset
U  data/nation/armenian.ruleset
U  data/nation/gallic.ruleset
U  data/nation/french.ruleset
U  data/nation/german.ruleset
U  data/nation/egyptian.ruleset
U  data/nation/aborigines.ruleset
U  data/nation/mexican.ruleset
U  data/nation/aramean.ruleset
U  data/nation/manchu.ruleset
U  data/nation/roman.ruleset
A  data/nation/texan.ruleset
U  data/nation/russian.ruleset
U  data/nation/Makefile.am
U  data/nation/sami.ruleset
U  data/misc/shields.spec
U  data/misc/flags.spec
A  data/flags/westphalia.svg
U  data/flags/Makefile.am
A  data/flags/westphalia.png
A  data/flags/texas-shield.png
A  data/flags/texas.svg
A  data/flags/texas.png
A  data/flags/westphalia-shield.png
U  po/POTFILES.in
U  common/worklist.c
U  common/game.c
U  client/include/helpdlg_g.h
U  client/packhand.c
U  client/gui-sdl/citydlg.c
U  client/gui-sdl/helpdlg.c
U  client/gui-sdl/wldlg.c
U  client/connectdlg_common.c
U  client/servers.c
 U .
Updated to revision 11317.

-- 
Christian Knoke            * * *            http://cknoke.de
* * * * * * * * *  Ceterum censeo Microsoft esse dividendum.