Subclipse中的一些状态

摘要: Subclipse中的一些状态

U: Working file was updated

G: Changes on the repo were automatically merged into the working copy

M: Working copy is modified

C: This file conflicts with the version in the repo

?: This file is not under version control

!: This file is under version control but is missing or incomplete

A: This file will be added to version control (after commit)

A+: This file will be moved (after commit)

D: This file will be deleted (after commit)

S: This signifies that the file or directory has been switched from the path of the rest of the working copy (using svn switch) to a branch

I: Ignored

X: External definition

~: Type changed

R: Item has been replaced in your working copy. This means the file was scheduled for deletion, and then a new file with the same name was scheduled for addition in its place.

L : Item is locked

E: Item existed, as it would have been created, by an svn update.


- A file ignored by version control. You can control what resources will be ignored by going toWindow → 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 file that needs a lock to be edited. These are typically files that cannot easily be merged (i.e. binary files), but may have many editors. A file needs a lock when its

svn:needs-lock

property is set, and Subversion will attempt to make these files read-only in the file system to enforce proper lock negotation.


- 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.
In a synchronization view (e.g. via Synchronize with Repository or Commit), as previously described, there are icons which indicate which direction a change is occurring in as well as additional information about that change. These are described below:
Outgoing


- 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


- 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


- 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.
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.


- Breaks up the change lists by revisions.