AMAPstudio

User Tools


Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Next revision
Previous revision
common_problems_with_svn [2018/01/22 09:36]
coligny created
common_problems_with_svn [2018/01/22 10:33] (current)
coligny
Line 1: Line 1:
 ====== Common problems with SVN ====== ====== Common problems with SVN ======
  
-All the commands below are run from SmartSVN.+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**+===== File status is Removed, but Commit ​not possible ​=====
  
 You tried to remove a file from svn and commit is 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 file level).+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).
  
-Removed, ​ 
  
-An error... commit failed , file is out of date+===== 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.
  
-**Phantom (Tree conflict)** 
  
-May happen when a local remove has been processed and someone else removed / commited the file on svn. 
  
-select file and choose Mark resolved 
common_problems_with_svn.1516613773.txt ยท Last modified: 2018/01/22 09:36 by coligny