File Status Highlights
In MPS, each file has its own status marked with a specific color. A file status shows how the actual file's content corresponds to the one marked as 'current'.
In the editor, each line in a file is checked for its correspondence with the 'current' state and is marked with a specific color in the left gutter area.
You can customize the default colors:
-
For files: In the Settings/Preferences dialog (Ctrl+Alt+S), under .
-
For lines in the editor: In the Settings/Preferences dialog (Ctrl+Alt+S), under .
File status
Color | File Status | Description |
|---|---|---|
Added | The file in the active changelist is scheduled for addition to the repository. | |
Added in not active changelist | The file in an inactive changelist is scheduled for addition to the repository. This file status is available if the Highlight files from non-active changelists option is enabled in . | |
Changelist conflict | The file in an inactive changelist has been modified in the active changelist. In this case, a new dialog will open prompting you to resolve the changelist conflict. This file status is available if all options are enabled in . | |
Copied | If a file is a copy of another file, its metadata is tracked, and such a file is marked as copied. | |
Deleted | The file is scheduled for deletion from the repository. | |
Deleted from file system | The file has been deleted locally, but hasn't been scheduled for deletion, and it still exists in the repository. | |
Have changed descendants | If a file is modified, the IDE will recursively highlight all directories containing that file. This status is available if the Show directories with changed descendants option is enabled in . | |
Have immediate changed children | If a file is modified, the IDE will highlight its parent directory. This status is available if the Show directories with changed descendants option is enabled in . | |
Ignored | A file is intentionally untracked by VCS. | |
Merged | The file is merged by your VCS as a result of an update. | |
Merged with conflicts | During the last update, the file has been merged with conflicts. | |
Merged with property conflicts | During the last update, the IDE has detected differences between the properties of the local file and its server version. | |
Merged with text and property conflicts | Text and property conflicts happen when two or more developers modify the same lines of a file and the same file properties. | |
Modified | The file has changed since the last synchronization. | |
Modified in not active changelist | The file in an inactive changelist has been modified. This file status is available if the Highlight files from non-active changelists option is enabled in . | |
Obsolete | The file should no longer be in your working copy of the repository. | |
Renamed | Since the last update, the file has been renamed. | |
| | Switched | [SVN] The file is taken from a different branch than the whole project. |
(Unknown) Unversioned | The file exists locally, but is not in the repository, and is not scheduled for addition. | |
| Up to date | The file hasn't been changed. |
Color | File Status | Description |
|---|---|---|
Added | The file in the active changelist is scheduled for addition to the repository. | |
Added in not active changelist | The file in an inactive changelist is scheduled for addition to the repository. This file status is available if the Highlight files from non-active changelists option is enabled in . | |
Changelist conflict | The file in an inactive changelist has been modified in the active changelist. In this case, a new dialog will open prompting you to resolve the changelist conflict. This file status is available if all options are enabled in . | |
Copied | If a file is a copy of another file, its metadata is tracked, and such a file is marked as copied. | |
Deleted | The file is scheduled for deletion from the repository. | |
Deleted from file system | The file has been deleted locally, but hasn't been scheduled for deletion, and it still exists in the repository. | |
Have changed descendants | If a file is modified, the IDE will recursively highlight all directories containing that file. This status is available if the Show directories with changed descendants option is enabled in . | |
Have immediate changed children | If a file is modified, the IDE will highlight its parent directory. This status is available if the Show directories with changed descendants option is enabled in . | |
Ignored | A file is intentionally untracked by VCS. | |
Merged | The file is merged by your VCS as a result of an update. | |
Merged with conflicts | During the last update, the file has been merged with conflicts. | |
Merged with property conflicts | During the last update, the IDE has detected differences between the properties of the local file and its server version. | |
Merged with text and property conflicts | Text and property conflicts happen when two or more developers modify the same lines of a file and the same file properties. | |
Modified | The file has changed since the last synchronization. | |
Modified in not active changelist | The file in an inactive changelist has been modified. This file status is available if the Highlight files from non-active changelists option is enabled in . | |
| Obsolete | The file should no longer be in your working copy of the repository. |
Renamed | Since the last update, the file has been renamed. | |
| Switched | [SVN] The file is taken from a different branch than the whole project. |
(Unknown) Unversioned | The file exists locally, but is not in the repository, and is not scheduled for addition. | |
| Up to date | The file hasn't been changed. |
Color | File Status | Description |
|---|---|---|
Added | The file in the active changelist is scheduled for addition to the repository. | |
Added in not active changelist | The file in an inactive changelist is scheduled for addition to the repository. This file status is available if the Highlight files from non-active changelists option is enabled in . | |
Changelist conflict | The file in an inactive changelist has been modified in the active changelist. In this case, a new dialog will open prompting you to resolve the changelist conflict. This file status is available if all options are enabled in . | |
Copied | If a file is a copy of another file, its metadata is tracked, and such a file is marked as copied. | |
Deleted | The file is scheduled for deletion from the repository. | |
Deleted from file system | The file has been deleted locally, but hasn't been scheduled for deletion, and it still exists in the repository. | |
Have changed descendants | If a file is modified, the IDE will recursively highlight all directories containing that file. This status is available if the Show directories with changed descendants option is enabled in . | |
Have immediate changed children | If a file is modified, the IDE will highlight its parent directory. This status is available if the Show directories with changed descendants option is enabled in . | |
Ignored | A file is intentionally untracked by VCS. | |
Merged | The file is merged by your VCS as a result of an update. | |
Merged with conflicts | During the last update, the file has been merged with conflicts. | |
Merged with property conflicts | During the last update, the IDE has detected differences between the properties of the local file and its server version. | |
Merged with text and property conflicts | Text and property conflicts happen when two or more developers modify the same lines of a file and the same file properties. | |
Modified | The file has changed since the last synchronization. | |
Modified in not active changelist | The file in an inactive changelist has been modified. This file status is available if the Highlight files from non-active changelists option is enabled in . | |
| Obsolete | The file should no longer be in your working copy of the repository. |
Renamed | Since the last update, the file has been renamed. | |
| Switched | [SVN] The file is taken from a different branch than the whole project. |
(Unknown) Unversioned | The file exists locally, but is not in the repository, and is not scheduled for addition. | |
| Up to date | The file hasn't been changed. |
Line status in the editor
Color | Line Status | Description |
|---|---|---|
| Modified lines | Lines that have been modified since the last update. |
| Whitespace-modified lines | Lines in which only whitespaces have been modified since the last update. |
| Added lines | Lines that have been added since the last update. |
| Deleted lines | Lines that have been removed since the last update. |
Color | Line Status | Description |
|---|---|---|
| Modified lines | Lines that have been modified since the last update. |
| Whitespace-modified lines | Lines in which only whitespaces have been modified since the last update. |
| Added lines | Lines that have been added since the last update. |
| Deleted lines | Lines that have been removed since the last update. |
Color | Line Status | Description |
|---|---|---|
| Modified lines | Lines that have been modified since the last update. |
| Whitespace-modified lines | Lines in which only whitespaces have been modified since the last update. |
| Added lines | Lines that have been added since the last update. |
| Deleted lines | Lines that have been removed since the last update. |