1.Node remains in conflict,
修改問價svn 提交後其他客戶端svn update更新時出現以下問題
Updating '.':
Skipped 'Hi3559_Stream' -- Node remains in conflict
Skipped 'out_bg0601' -- Node remains in conflict
At revision 641.
Summary of conflicts:
Skipped paths: 2
svn cleanup後依然無效,
解決辦法:
svn revert --depth=infinity Hi3559_Stream
svn revert --depth=infinity out_bg0601
最後一個爲衝突文件名
輕鬆解決
2. local dir edit, incoming dir delete upon update
Tree conflict on '*****'
> local dir edit, incoming dir delete upon update
Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help:
感覺選擇哪個都會在下次更新時出問題,
解決辦法
svn revert *****(file) -R 輕鬆解決!
3. svn add 且未提交前刪除已經增加的
svn revert --recursive addfolder
4. 更換URL
svn info 查看舊版的url
svn switch --relocate "原svn地址" "新svn地址"
5.svn: E155010: Commit failed (details follow):
svn: E155010: '/home/**/.tmp_versions/autofs4.mod' is scheduled for addition, but is missing
svn add後commit時被刪除了
處理方法:svn revert /home/**/.tmp_versions/autofs4.mod
顯示 Reverted 'osdrv/opensource/kernel/linux-4.9.y/.tmp_versions/autofs4.mod'即可。