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

Timestamp:

Feb 17, 2008, 11:33:06 PM (16 years ago)

Author:

nicolasc

Comment:

ci

code/tools/SVN

@@ -6 +6 @@
 svn up
 svn ci -m "some message"
+svn add myFile.cc myFile.h
+svn rm trash-folder
 svn cp https://svn.orxonox.net/orxonox/trunk https://svn.orxonox.net/orxonox/branches/test
 svn diff
@@ -42 +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].
+
 === checkin (ci) ===
-sometime also called commit
+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.
+
+this will checkin the current directory including subfolders with the comment "initial upload"
+{{{
+svn ci -m "initial upload"
+}}}
+
+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].
+