Changes between Version 5 and Version 6 of code/tools/SVN

Timestamp:

Feb 18, 2008, 12:19:11 AM (16 years ago)

Author:

nicolasc

Comment:

di, change checkin to commit

code/tools/SVN

@@ -11 +11 @@
 svn cp https://svn.orxonox.net/orxonox/trunk https://svn.orxonox.net/orxonox/branches/test
 svn resolved somefile.cc
+svn revert 
 svn diff
-svn revert 
 }}}
 
@@ -47 +47 @@
 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].
 
-=== checkin (ci) ===
-sometime also called commit, does the opposite of checkout or update, it upload changes made to the local the to the server. The syntax is ''svn ci -m <commit message> <local-path>'', if <local-path> is omitted, the current directory is assumed, if -m <commit message> is ommited, an editor will pop up where you can (and should) write a meaningful commit message.
+=== commit (ci) ===
+sometime also called checkin, does the opposite of checkout or update, it upload changes made to the local the to the server. The syntax is ''svn ci -m <commit message> <local-path>'', if <local-path> is omitted, the current directory is assumed, if -m <commit message> is ommited, an editor will pop up where you can (and should) write a meaningful commit message.
 
 this will checkin the current directory including subfolders with the comment "initial upload"
@@ -55 +55 @@
 }}}
 
-A checkin 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].
+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].
 
 === add ===
@@ -74 +74 @@
 
 === move (mv) ===
-sometime called rename - as a rename is the same as a move. The command simplifies the rearranging of files in the svn tree. the syntax is ''svn mv <source files> <target-folder>''
+sometime called rename (ren) - as a rename is the same as a move. The command simplifies the rearranging of files in the svn tree. the syntax is ''svn mv <source files> <target-folder>''
 
 this will move the files myFile.cc and myFile.h to myFolder
@@ -83 +83 @@
 this will rename the file myFiel.cc to myFile.cc - to correct a typo. please note the mv and rename are the same command
 {{{
-svn rename myFiel.cc myfile.cc
+svn ren myFiel.cc myfile.cc
 }}}
 
@@ -102 +102 @@
 }}}
 
+=== revert ===
+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.
+
+this will discard all local changes made to myFile.cc
+{{{
+svn revert myFile.cc
+}}}
+
+=== diff (di) ===
+another rarely used but very useful command. it shows you 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. the syntax is ''svn di <local-path>'', if <local-path> is omitted, the current directory is assumed. 
+
+this will show - print to the console - the current changes made to the revision
+{{{
+svn di .
+}}}