Status “S” in Subversion

后端 未结 14 1056
臣服心动
臣服心动 2021-02-03 16:52

At some point all files in my working copy got marked with \"S\" symbol as shown below:

$ svn st
M    S   AclController.php
     S   InstallationController.php
          


        
14条回答
  •  -上瘾入骨i
    2021-02-03 17:02

    I had 'S' status while switching from trunk (r100) to some branch (r50). I got the error :

    svn: Failed to add file 'web/.htaccess': an unversioned file of the same name already exists
    

    All web/'s subdirs were 'S' flagged.

    The cause : i had deleted .htaccess to svn:ignore it (r100), then had created it again (unversioned and ignored). The branch (r50) still had web/.htaccess in the repo.

    The solution :

    mv web/.htaccess ../../
    svn switch back to trunk
    svn switch to branch again
    

    Everything's fine.

提交回复
热议问题