Note: conflict files in the directory must first develop and confirm before performing a recovery operation
1, the implementation of today svn update update java code occur when the following error
[root@minion01-ops ROOT]# svn update -r 410
Updating '.':
D META-INF
A META-INF
Skipped 'WEB-INF' -- Node remains in conflict
.....2, the file WEB-INF directory conflict, resulting in the update time, the directories to be skipped, the following command to restore WEB-INF directory
[root@minion01-ops ROOT]# svn revert --depth=infinity WEB-INF/
Reverted 'WEB-INF'
Reverted 'WEB-INF/lib'
......Restore the entire directory files: - depth = infinity
3. After reducing WEB-INF directory, in the current version rollback, and then more to the latest version, the perfect solution (you can also let developers build the new version will then update to the latest version)
// 先回退上一个版本
[root@minion01-ops ROOT]# svn update -r 168
// 然后更到最新版本
[root@minion01-ops ROOT]# svn update -r 416