![]() Your changes have not been committed yet though. If you had changed the mrGlobals.m file, for example. Note that the command takes the main trunk version of the repository, then the changes that you want to apply from your development repository and then finally the local repository where you want the changes to be applied. The merge command will then take all of your changes in the dev branch, compare them to what is in the trunk repository and merge them into your local working copy of the trunk: main development branch of mrTools that everyone is using). First cd to your local version of trunk (i.e. You do this by issuing an svn merge command. When you are done making and committing your changes, you should merge the development branch back to the trunk (the main version of the repository). Now you can use this local repository like any other repository. Once you have made a copy, check it out (again replace dev with the name of your choice) Also, you will need to be a developer with write privileges (ask Valerio for mrTools). For some reason, for copies, you must use the https secure site, and it will ask you to accept a certificate. If you want to make yourself a new branch, then you can issue an svn copy command (change dev to a name of your choice): Restoring a file that was deleted in the past requires an 'svn log -v' for the folder where it was deleted and then an 'svn update' for the file with revision number. ![]() ![]() For all of our projects we have a trunk directory (main development – this is the branch everyone is using, so be very careful when making changes here) and a branches directory (temporary development, good for when you want to make some local changes without affecting anyone else). To create a branch, you use the copy command. This is a slightly modified version of the original which did not work for me since svn mysteriously called it with five input arguments. ancestor "$ancestorfile" -merge "$mergefile"
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |