Update Command File Codes
Each file that Update does something with will be listed with a letter before it. Here is what the letters mean.
U - the file was changed in the repository and your copy has been brought up-to-date.
P - The file was changed in the repository and your copy has been brought up-to-date. A PATCH was sent rather than the whole file.
A - the file existed in your working copy and will be added to the repository when you run CVS Commit
R - a file has been Removed from your working copy and will be removed from the repository when you run CVS Commit.
M - NOTE THIS ONE. You have modified this file and have not committed the changes. The M can ALSO indicated that the file was modified on the server and the changes were successfully merged with your changes.
C - You have modified this file and someone else has also. The two changes Conflict so CVS could not merge your changes with theirs. You original file is renamed to .#file.version and your new working file has conflict marks in it. (Note; Some operating system erase .# files, so you need to rename it if you want to keep it.)
? - This file is in your working folder but does not match anything in the repository or the ignore list. (Usually you need to add these to the project.)