Tortoise SVN常見圖標含義及圖標無法正常解決方法!


轉自:https://blog.csdn.net/xh16319/article/details/10582455

綠色的勾:圖標表示這是一個最新取出的工作副本,他的Subversion狀態是normal。

灰色的勾:灰色圖標表示”只讀”,如果你給一個文件設置了svn:needs-lock屬性,Subversion會讓此文件只讀,直到你獲得文件鎖。只讀文件具有這個重載圖標來表示你必須在編輯之前先得到一個鎖。

紅色感嘆號:當你開始編輯一個文件,這個文件的狀態就會變成modified,圖標也會變成紅色圓圈帶一個感嘆號。這樣你就可以輕易的知道自從上次更新以來都有修改過哪些文件,需要提交哪些文件。

黃色感嘆號:三角符號帶感嘆號,表示在一次update中產生了一個沖突(conflict)。

藍色加號:意味着這個文件或文件夾已經被計划加入到版本控制之下。

紅叉叉:表示相應文件或文件夾被計划刪除(deleted),或者表示文件缺失。

灰色一行:表示不受版本控制,忽略版本控制。

藍色問號:暫時還沒收到版本的控制,但是沒有被忽略。

鎖扣:表示文件被鎖定,他的Subversion狀態是normal,必須先釋放鎖才能讓別人的更改提交。

 

 

 

SVN圖標無法正常顯示問題解析:
1.在Myeclipse或者Eclipse中使用SVN插件作為版本控制器,一直以來都是正常使用的。但是突然喲一天,project下的files的版本號和提示圖標都不見了,經過檢查SVN是正常的。
開始的時候是把wrokspace下的.metadata刪除,然后重新將project導入workspace下,即可正常使用。
但是現在發現一種更為方便的方法:
進入 到:windows->preferences->General->Appearance->LableDecorations勾選其中的SVN項即可。或者,還可以打開windows->preferences->Team->SVN中做相關設置。

2.最近更新了SVN軟件,更新后發現,同步文件夾沒有打對勾的標記,網上都說檢查SVN設置:
右鍵->TSVN->設置->樣式->重疊圖標->Statuscache
里面有三個選項:
1Default
2Shell
3None
如果是前面兩個,應該就有svn圖標,如果是none,就沒有。
但都解決不了問題,后來用安裝文件的修復功能解決了此問題,即雙擊安裝文件,選修復,之后重啟系統就可以了。這似乎是SVN更新后的普遍問題。

 

 

 

 

  • 項目視圖   The Package Explorer view

 

- 已忽略版本控制的文件。可以通過Window → Preferences → Team → Ignored Resources.來忽略文件。
A file ignored by version control. You can control what resources will be ignored by going to Window → Preferences → Team → Ignored Resources.

 - 未納入版本控制的文件,一般是新增,尚未提交的文件。
A file not under version control. These are typically new files that you have not committed to the repository yet.

- 本地重命名或移動到其它目錄的文件。
A versioned file that needs to be added to the remote repository. These are typically files you have either renamed, or moved to a different directory.

- 本地刪除的目錄。
A deleted folder. These are folders that you have deleted locally without yet committing the changes to the repository. Note that files are usually removed from the view when they're deleted locally, so they are normally not seen with this icon.

- 沒有任何改動的文件。
A file with no local changes.

- 發生改動,尚未提交的文件。
A file with local, uncommitted changes.

- 處於鎖定狀態的文件。
A locked file.

- 有沖突沒有解決,就更新或提交的文件。
A conflicted file. These are typically files that had a commit/update conflict that you marked to resolve later.

 - 有目錄樹沖突的文件。一般在最近一次更新后,資源庫上的文件被移動、刪除或重命名。
A file that has a tree conflict. These are typically files that have local changes, but have since been moved, removed, or renamed in the repository since the last local copy update.

-  引用外部項目的文件,不能提交到本項目的資源庫里。
A file that is external to the project. Linked external files cannot be committed to the repository.

- 有分支版本的文件。這些文件屬於另外一個不同的工作目錄而不是屬於本地的父目錄。
A file that has been switched. These are files which belongs to a different working copy than their local parent directory.

 

  • 遷出 Outgoing view

 

- 本地有更改的文件。
A file whose contents have been modified and will be committed to the repository.

- 本地新增的文件。
 A file that will be newly added to the repository. This may coincide with a file removal in cases where a file is moved or renamed..

- 本地刪除的文件。
A file that will be removed from the repository. This may coincide with a file addition in cases where a file is moved or renamed.

- 本地文件屬性發生變化了的文件。
A file with property changes, in the Commit dialog. On the Synchronize tab, property changes are currently reflected as a normal file modification ().

 

  • 遷入 Incoming view

 

- 需要更新的文件。 
A file that has content changes committed to the repository that will be applied to the local copy.

- 需要遷入的新增文件。
A new file that will be added to the local copy from the repository. Like the outgoing file addition, this may be the result of a move or rename.

- 資源庫中刪除了的文件。
A file that will be removed from the local copy because it has been removed from the repository. Like the outgoing file removal, this may be the result of a move or rename.

 

  • 沖突 Conflict view

 

- 資源庫和本地同時有修改的文件。
A file that has been changed in both the local copy and repository independently, causing a need for conflict resolution. Fixing this condition involves opening up the conflict view or forcibly overwriting changes locally or remotely.

- 遠程資源庫上已經被重命名或移動、刪除的文件。 
A file that has a tree conflict. This can occur when there are new changes to a file on one end (either local or remote), and the file is moved, removed, or renamed on the other.

 

  • “與資源庫同步”選項打開的界面上的一些按鈕 Others :

 

Finally, the Synchronize with Repository option opens the Synchronize tab () with the following buttons:
 
- 同步選中的文件,下拉箭頭切換不同的遠程目錄。
Synchronizes the local copy with the currently selected repository when clicked. Selecting from the drop-down allows switching between different remote code bases.

- 只顯示需要遷入的文件。

Shows only incoming changes (remote → local).

 - 只顯示需要提交的文件。

Shows only outgoing changes (local → remote).

- 同時顯示需要更新或提交文件。

Shows both incoming and outgoing changes (remote ↔ local).

- 只顯示有沖突的文件。

Shows conflicting changes.

- 更新全部文件。

Updates all local resources with incoming changes after prompt.

- 提交全部文件。

Brings up the commit dialog to commit all outgoing changes.

 


免責聲明!

本站轉載的文章為個人學習借鑒使用,本站對版權不負任何法律責任。如果侵犯了您的隱私權益,請聯系本站郵箱yoyou2525@163.com刪除。



 
粵ICP備18138465號   © 2018-2025 CODEPRJ.COM