Commit error

[Brederic]

I'm getting this error when I try to commit my changes:

Updating '/var/tournoi/games/rememberwhen':
Skipped '/var/tournoi/games/rememberwhen/rememberwhen.js' -- Node remains in conflict
Skipped '/var/tournoi/games/rememberwhen/material.inc.php' -- Node remains in conflict
At revision 23961.

How do I resolve this?

[Een]

I managed it on the server with the command line, it should be ok now.

[Brederic]

Thanks, now I see:

Updating '/var/tournoi/games/rememberwhen':
At revision 23961.
svn: warning: W155010: '/var/tournoi/games/rememberwhen/img/back' not found
svn: E200009: Could not add all targets because some targets don't exist
svn: E200009: Illegal target for the requested operation
svn: warning: W155010: '/var/tournoi/games/rememberwhen/img/box' not found
svn: E200009: Could not add all targets because some targets don't exist
svn: E200009: Illegal target for the requested operation
svn: warning: W155010: '/var/tournoi/games/rememberwhen/img/box' not found
svn: E200009: Could not add all targets because some targets don't exist
svn: E200009: Illegal target for the requested operation
svn: warning: W155010: '/var/tournoi/games/rememberwhen/img/box' not found
svn: E200009: Could not add all targets because some targets don't exist
svn: E200009: Illegal target for the requested operation
svn: warning: W155010: '/var/tournoi/games/rememberwhen/img/box' not found
svn: E200009: Could not add all targets because some targets don't exist
svn: E200009: Illegal target for the requested operation
svn: warning: W155010: '/var/tournoi/games/rememberwhen/img/box' not found
svn: E200009: Could not add all targets because some targets don't exist
svn: E200009: Illegal target for the requested operation
svn: warning: W155010: '/var/tournoi/games/rememberwhen/img/game' not found
svn: E200009: Could not add all targets because some targets don't exist
svn: E200009: Illegal target for the requested operation
svn: warning: W155010: '/var/tournoi/games/rememberwhen/img/game' not found
svn: E200009: Could not add all targets because some targets don't exist
svn: E200009: Illegal target for the requested operation
svn: warning: W155010: '/var/tournoi/games/rememberwhen/img/game_box' not found
svn: E200009: Could not add all targets because some targets don't exist
svn: E200009: Illegal target for the requested operation
svn: E155015: Commit failed (details follow):
svn: E155015: Aborting commit: '/var/tournoi/games/rememberwhen/material.inc.php' remains in conflict
HAL says: done.

[Een]

I checked conflicts again and commited from the manage project interface to make sure it was ok -> really solved now.

The errors on the images come from the fact that spaces are used in the filenames. If you replace them with '_' or '-' then everything should be OK.

[Brederic]

Thanks, I uploaded those files with spaces in the name by mistake and would like to delete them, but when I delete them and try to commit, the commit generates those errors and the files reappear in the ftp directory.

I renamed them, and after committing I have both my renamed files AND the original ones with spaces.


If you have a way on the server side to delete the files with spaces in the names, that would be great for me.

[Een]

Ok, fixed

[Brederic]

Great. Thanks so much!

[Een]

You are welcome, congrats on the update!