I'm fielding a few side-band questions about these codes, so, here's an explanation for everybody. Also added to wiki as http:// wiki.openlaszlo.org/SVNStatusCodes, which is linked in from http:// wiki.openlaszlo.org/SubversionTips
When you do svn status, the following codes apply: A locally added, not checked in yet D locally deleted, not checked in yet C You made local changes, then you updated, and there was a conflict. There will be conflict markers in the file. You have to do svn resolved before you can check in your local changes. Your version of the file will be in filename.mine. Subversion does not squash your local changes. G You made local changes, then you updated, and the repository changes were successfully merged to your local copy. M locally modified and not modified in the repository ? it doesn't know what this file is. It's okay when this happens for build products, but bad when it happens for source files you're adding. ! A file is missing that it expects to be there. We get this for some stuff in docs/src after ant clean, but it doesn't seem to hurt anything. ..... When you do svn update, the codes are similar, except in reverse, sort of: A added to the repository and now added to your working copy D deleted from the repository and now deleted from your working copy C You made local changes, then you updated, and there was a conflict. There will be conflict markers in the file. You have to do svn resolved before you can check in your local changes. Your version of the file will be in filename.mine. Subversion does not squash your local changes. G You made local changes, then you updated, and the repository changes were successfully merged to your local copy. M This shouldn't happen U The repository version was updated, and the repository changes have been applied to your working copy, which you have not modified. _______________________________________________ Laszlo-dev mailing list [email protected] http://www.openlaszlo.org/mailman/listinfo/laszlo-dev
