Changes between Version 9 and Version 10 of code/tools/SVN
- Timestamp:
- Feb 18, 2008, 12:39:53 AM (16 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
code/tools/SVN
v9 v10 18 18 19 19 If not noted otherwise all commands are recursive. 20 20 ---- 21 21 === checkout (co) === 22 22 The checkout command is used to create a local copy of a svn subtree on the local computer. … … 33 33 svn co -r 200 https://svn.orxonox.net/orxonox/branches/test 34 34 }}} 35 35 ---- 36 36 === update (up) === 37 37 update is closely related to checkout, as it also download - or updates - the svn tree. while checkout is normally only used once, update is used all the time. … … 50 50 51 51 Updates may cause conflicts if the remote and local file has been changed in the same place. to resolve a conflict see [wiki:SVN#resolved here]. 52 52 ---- 53 53 === commit (ci) === 54 54 Sometime also called checkin, does the opposite of checkout or update, it upload changes made to the local the to the server. … … 62 62 63 63 A commit is only possible if the local version is up-to-date. if it isn't you will get an error, and the commit will fail. the solution then is to do an [wiki:SVN#updateup update]. 64 64 ---- 65 65 === add === 66 66 Adding a new file to the local svn copy, that it get upload with the next commit. … … 72 72 svn add myFolder/myFile.cc myFolder/myFile.h 73 73 }}} 74 74 ---- 75 75 === remove (rm) === 76 76 Also called delete (del), which deletes an item from the svn tree. please note that this also removed the file/folder from the local harddrive. … … 82 82 svn rm myOldFile.cc 83 83 }}} 84 84 ---- 85 85 === move (mv) === 86 86 Sometime called rename (ren) - as a rename is the same as a move. The command simplifies the rearranging of files in the svn tree. … … 97 97 svn ren myFiel.cc myfile.cc 98 98 }}} 99 99 ---- 100 100 === copy (cp) === 101 101 A command which is rarely used on the local tree - why would someone need a file twice in the same tree? - but it is rather useful to create new branches. though it is normally done by the supervisors, it can be done by the students. … … 107 107 svn cp https://svn.orxonox.net/orxonox/trunk https://svn.orxonox.net/orxonox/branches/test 108 108 }}} 109 109 ---- 110 110 === resolved === 111 111 If a conflict arises - this normally happens if someone change a file on the server (committed it) while you were doing changes in the same place. This command '''does not solve''' the conflict, but it removes the other unnecessary files. … … 117 117 svn resolved myConflictFile.cc 118 118 }}} 119 119 ---- 120 120 === revert === 121 121 One of the major advantages of a version control system, is that you can always revert to a known saved state - in this case the last updated local revision. revert removes all local changes and restores the file to a state prior editing, i.e discarding all local changes. … … 127 127 svn revert myFile.cc 128 128 }}} 129 129 ---- 130 130 === diff (di) === 131 131 Another rarely used but very useful command. It shows the difference between the downloaded revision and the current state, which basically what will be uploaded at the next commit. It is also useful to check if all new files have been added to the svn tree - it happens very often, the there are two commits in short time, first the updates, then the new files.
