SVN - Skipped paths

后端 未结 11 1054
轻奢々
轻奢々 2020-12-15 16:01

I received this message when I ran a SVN UP:

Skipped \'trunk/scripts/accountability_survey_report.php\'
At revision 1585.
Summary of conflicts:
  Skipped pat         


        
11条回答
  •  旧巷少年郎
    2020-12-15 16:29

    Easiest solution:

    sudo svn delete --force accountability_survey_report.php
    

    Now just to be sure run:

    sudo svn commit --force accountability_survey_report.php
    

    SVN will moan:

    svn: Commit failed (details follow):
    svn: Aborting commit: 'trunk/scripts/accountability_survey_report.php' remains in conflict
    

    Ignore the moaning, and run:

    sudo svn update accountability_survey_report.php
    A accountability_survey_report.php
    Updated to revision ......
    

    The above adds the latest copy of the file "accountability_survey_report.php" from the svn server to your local. Run svn update again and there will be no more svn complains about that file.

    I will of-course backup the required copy of file first before deleting.

提交回复
热议问题