AMAPstudio

User Tools


Common problems with SVN

All the commands below are run from SmartSVN. We consider here files local status (not remote). Remember that svn add and svn remove must be completed by a svn commit to be validated on the server.

File status is Removed, but Commit not possible

You tried to remove a file from svn and commit is not possible.

Check if you did svn remove on the directory in the Files lateral panel. If so, the svn commit must also be done directly on the directory (and not at the level of the files containaed in the directory).

Phantom (Tree conflict)

May happen when a local remove has been processed and someone else removed / commited the file on the svn server.

Select file and choose mark resolved, option 1 (not 'accept incoming delete')

Removed (Tree conflict)

Revert will cancel your local action (remove, delete, move…) and may solve the problem.

Removed (Tree conflict: local file delete, incoming edit upon update)

Revert will cancel your local removing order and accept the commited modification by the other user, the file will become unchanged locally.

common_problems_with_svn.txt · Last modified: 2018/01/22 10:33 by coligny