Changes between Version 3 and Version 4 of code/tools/SVN

Timestamp:

Feb 17, 2008, 11:47:12 PM (16 years ago)

Author:

nicolasc

Comment:

resolved

code/tools/SVN

@@ -8 +8 @@
 svn add myFile.cc myFile.h
 svn rm trash-folder
+svn resolved somefile.cc
 svn cp https://svn.orxonox.net/orxonox/trunk https://svn.orxonox.net/orxonox/branches/test
 svn diff
-svn resolve somefile.cc
 svn revert 
 }}}
@@ -19 +19 @@
 the checkout command is used to create a local copy of a svn subtree on the local computer.
 
-the syntax used is ''svn co <remote-path> <local-path>'', if <local-path> is omitted the last remote folder will be used as <local-path>.
+the syntax used is ''svn co -r <revision> <remote-path> <local-path>'', if -r <revision> is omitted, the HEAD revision is assumed, which is also the newest one, if <local-path> is omitted the last remote folder will be used as <local-path>.
 
 This will create a folder orxonox-trunk with the contents of the trunk
@@ -26 +26 @@
 }}}
 
-This will create a folder called test, with the content of the test branch.
+This will create a folder called test, with the content of the test branch at revision 200.
 {{{
-svn co https://svn.orxonox.net/orxonox/branches/test
+svn co -r 200 https://svn.orxonox.net/orxonox/branches/test
 }}}
 
@@ -44 +44 @@
 }}}
 
-Updates may cause conflicts if the remote and local file has been changed in the same place. to resolve a conflict see [wiki:SVN#resolve here].
+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) ===
@@ -54 +54 @@
 }}}
 
-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#update(up) update].
+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].
 
+=== add ===
+adding a new file to the local svn copy, that it get upload with the next commit. the syntax is ''svn add <file>''
+
+this will add the files myFile.cc and myFile.h in the folder myFolder to the svn
+{{{
+svn add myFolder/myFile.cc myFolder/myFile.h
+}}}
+
+=== remove (rm) ===
+also called delete, which deletes an item from the svn tree. please note that this also removed the file/folder from the local harddrive. the syntax is ''svn rm <file/folder>''. you still need to commit it to the server.
+
+this will remove the file myOldFile.cc from the svn tree
+{{{
+svn rm myOldFile.cc
+}}}
+
+=== resolved ===
+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.
+
+this will resolve the conflict in in myConflictFile.cc, and make the copy committable again.
+{{{
+svn resolved myConflictFile.cc
+}}}
+