Status according to local and repository states | Repository state relative to local revision | ||||
Equal revision | Greater revision | Erased (File in Attic) | Not existent | ||
Local state relative to local revision | Not modified | Up-to-date | Needs Patch | Entry Invalid | PROHIBITED |
Modified | Locally Modified | Needs Merge | Unresolved Conflicts | PROHIBITED | |
Added | Unresolved Conflicts* | Unresolved Conflicts* | Unknown* | Locally Added | |
Removed | Locally Removed | Unresolved Conflicts | Entry Invalid | PROHIBITED | |
Had Conflicts | File had conflicts on merge | Needs Merge | Unresolved Conflicts | PROHIBITED | |
Erased | Needs Checkout | Needs Checkout | Entry Invalid | Unknown* | |
No File | Needs Checkout* | Needs Checkout* | Up-to-date* | Unknown* | |
Unknown | Unresolved Conflicts* | Unresolved Conflicts* | Unknown* | Unknown* | |
*: No entry for the file | |||||