Subversion fails to update

Subversion fails to update

Discuss the source code and development of Spring Engine in general from a technical point of view. Patches go here too.

Moderator: Moderators

Post Reply
revcompgeek
Posts: 34
Joined: 29 May 2008, 21:06

Subversion fails to update

Post by revcompgeek »

I just tried to update my local repository and here is what SVN tells me:

Code: Select all

A    Lobby/TASClient/Lobby
A    Lobby/TASClient/Lobby/Var
A    Lobby/TASClient/Lobby/Var/tips.txt
svn: Failed to add directory 'Lobby/TASClient/lobby': object of the same name already exists
Looks like someone added a directory with a different case and svn is picking it up. Can someone fix this?
User avatar
hoijui
Former Engine Dev
Posts: 4344
Joined: 22 Sep 2007, 09:51

Re: Subversion fails to update

Post by hoijui »

looks like LordMatt added this in a Request by Satirik. you should first talk to them before changing this, as there will be references in the code to the lower case version of the directory name.

more simple would be, if you change your stuff; approximately like this:
  • change your Lobby/Var to lobby/var in your code
  • move your tips.txt to somewhere else, eg the Desktop
  • delete your Lobby/Var directory
  • get lobby/var from SVN by updating
  • put your tips.txt back to lobby/var
  • upload to SVN
User avatar
yuritch
Spring 1944 Developer
Posts: 1018
Joined: 11 Oct 2005, 07:18

Re: Subversion fails to update

Post by yuritch »

Apparently someone who uses linux (or some other case-sensitive OS) made that change without taking Windows users into account. So now we poor Windows people cannot update our local svn copies. And we can't do much about this on our end (apart from switching to linux of course :) ) as it's not 'our' stuff, it's the main Spring svn. Deleting/renaming/whatever in local repositories won't do any good as on the next update command svn will try to recreate the folders from the main server and will run into the same error again.
However, this seems to only affect the lobby folder, so manually doing svn update on all the other subfolders in svn repo should allow one to update.
revcompgeek
Posts: 34
Joined: 29 May 2008, 21:06

Re: Subversion fails to update

Post by revcompgeek »

I am actually a Mac user, and it still doesn't work for me.
Tobi
Spring Developer
Posts: 4598
Joined: 01 Jun 2005, 11:36

Re: Subversion fails to update

Post by Tobi »

Fixed, satirik broke it.

(in r5885 LordMatt added "lobby" and in r6372 Satirik added "Lobby". So Satirik, plz actually use svn update sometime in particular after you asked someone to modify something :-))
Satirik
Lobby Developer
Posts: 1688
Joined: 16 Mar 2007, 18:27

Re: Subversion fails to update

Post by Satirik »

Tobi wrote:Fixed, satirik broke it.

(in r5885 LordMatt added "lobby" and in r6372 Satirik added "Lobby". So Satirik, plz actually use svn update sometime in particular after you asked someone to modify something :-))
i didn't ask anybody to do anything :) anyway what he did is a good idea
User avatar
FLOZi
MC: Legacy & Spring 1944 Developer
Posts: 6241
Joined: 29 Apr 2005, 01:14

Re: Subversion fails to update

Post by FLOZi »

Satirik wrote:
Tobi wrote:Fixed, satirik broke it.

(in r5885 LordMatt added "lobby" and in r6372 Satirik added "Lobby". So Satirik, plz actually use svn update sometime in particular after you asked someone to modify something :-))
i didn't ask anybody to do anything :) anyway what he did is a good idea

Except when AF suggests it?
Satirik
Lobby Developer
Posts: 1688
Joined: 16 Mar 2007, 18:27

Re: Subversion fails to update

Post by Satirik »

FLOZi wrote:
Satirik wrote:
Tobi wrote:Fixed, satirik broke it.

(in r5885 LordMatt added "lobby" and in r6372 Satirik added "Lobby". So Satirik, plz actually use svn update sometime in particular after you asked someone to modify something :-))
i didn't ask anybody to do anything :) anyway what he did is a good idea

Except when AF suggests it?
do you even know what you're talking about ?

no ? lordmatt just renamed the Lobby to lobby (i guess it was not a choice) and committed the groups.ini i asked him a while ago to add to the installer but i didn't commit it on the svn
Tobi
Spring Developer
Posts: 4598
Joined: 01 Jun 2005, 11:36

Re: Subversion fails to update

Post by Tobi »

You committed Lobby/Var/tips.txt, after lobby/var/ was already added by LordMatt :-)

Code: Select all

r6372 | satirik | 2008-09-05 18:29:19 +0200 (vr, 05 sep 2008) | 3 lines
Changed paths:
   [...]
   A /trunk/Lobby/TASClient/Lobby
   A /trunk/Lobby/TASClient/Lobby/Var
   A /trunk/Lobby/TASClient/Lobby/Var/tips.txt
   [...]

Code: Select all

r5885 | LordMatt | 2008-05-13 01:47:35 +0200 (di, 13 mei 2008) | 2 lines
Changed paths:
   A /trunk/Lobby/TASClient/lobby
   A /trunk/Lobby/TASClient/lobby/var
   A /trunk/Lobby/TASClient/lobby/var/groups.ini
User avatar
det
Moderator
Posts: 737
Joined: 26 Nov 2005, 11:22

Re: Subversion fails to update

Post by det »

You could set up an SVN hook to reject commits if there are case-sensitivity conflicts.
Satirik
Lobby Developer
Posts: 1688
Joined: 16 Mar 2007, 18:27

Re: Subversion fails to update

Post by Satirik »

13/05/2008 wow that was a while ago :) im not used to see people committing on tasclient :)
Post Reply

Return to “Engine”