5oct15 corrected To work with your SVN repository in the grafiXlab, 102 AH you should do this from any of the iMac computers in the lab. ============ 0. Whenever you wish to work in an image of your repository (checktou, update, commit etc) on the labmac in front of you, the first think you must do each day is to $ kdestroy ;; you can check with klist that you were successful $ kinit ivanho2@AD.UILLINOIS.EDU ;; and use your AD password when asked. ============ 1. Log into the labmac with your AD password. 2. Open a shell. You will be in your home directory. (You can pwd to check.) 3. Check whether you already have an image (copy) of your repository. If you already have an image (copy) of your repository in your home directory proceed to step XX. Otherwise proceed. 4. Enter, substituting your netid for ivanho2, and your repository name, $ svn checkout https://webapps.math.uiuc.edu/svn/groups/class000f15 ;; A lot of file names will start scrolling on the screen. 5. Every time you enter an image of your repository, be sure first enter $ svn update ;; files you have added and committed elsewhere load, and changes are synchronize. 6. Now you can work inside your repository any way you are accustomed to, mouse moves or continue working in the unix shell. You can edit existing files, and add new ones. 7. But you should NOT delete, rename, or move any file (and folder) you have previously added and committed to your repo. You may edit such files. To tell which files are in the repository and which are not, enter $ svn status ;; files marked with a ? are NOT in your repository, they are strictly local to this image. 8. Before your stop working, check the status of your repository image. Enter $ svn add foobar ;; to add new files to your repository. See below for more advanced actions. 9. Check the status again. The letter A indicates files you have added. M indicates files you have modified D indicates files you have deleted (using $ svn rm foobar ) ? indicates files that will remain in this image only. 10. Any other letters, such as C, L, etc require assistance before you $ svn commi -m 'memorable information' ;; if there is nothing memorable about this session, just enter a blank string between the quotes. 11. You may now leave the repository. If you update, you should see nothing. 12. Any other responses by SVN means you have created a conflict. Common conflicts created by trying to make unnecessary correction, especially on files created on a PC but looked at on a Mac. Names you originally attempted to insert spaces or keyboard symbols other that hyphens or underscores. Too many dots in the name etc. There are even more fatal conflicts, don't try them out. 13. If you have created a conflict in your repository, do NOT attempt to fix them yourself. This will make them worse. A quick (!!!) solution is this. Move and rename the entire image of your current repository, for in stance with a this sequence of commands, or a contraction of it. $ mv classXYZf15 .. ;; moves image out of the way of svn $ svn checkout https:// ;; a new copy, see 4. $ cd .. ;; where the old copy is located $ mv classXYZf15 conflicted-repo ;; or some such name. Now you can compare and transfer files (NOT folders) form the coflicted-repo to the new image and do it right to avoid a conflict. If the new checkout fails, then we have a serious problem (stuff happens!) and you do need help. Ignfore your helper's exasperated expletives.