Differences

This shows you the differences between two versions of the page.

--- subversion-howto [2009/06/21 11:52] – Updated info about merging prior to svn server version 1.4 bp
+++ subversion-howto [2009/06/21 12:00] – bp
@@ Line 238: / Line 238: @@
 <code>
-$ svn merge -r 406:480 http://www.ooem.trunk/svn/trunk
+$ svn merge -r 406:480 http://www.oofem.trunk/svn/trunk
 U   integer.c
 U   button.c
@@ Line 262: / Line 262: @@
 At revision 1910.
-$ svn merge http://svn.example.com/repos/calc/trunk@1910 \
+$ svn merge http://www.oofem.org/svn/trunk@1910 \
-            http://svn.example.com/repos/calc/branches/mybranch@1910
+            http://www.oofem.org/svn/branches/my-branch@1910
 U  real.c
 U  integer.c
@@ Line 341: / Line 341: @@
-The definite information can be found on the Subversion project page http://subversion.tigris.org/ and in the online Subversion book http://svnbook.red-bean.com/.
+The definite information can be found on the Subversion project page http://subversion.tigris.org/ and in the online Subversion book http://svnbook.red-bean.com/. The oofem svn repository server is based on version 1.4, the corresponding version of svn book can be found here http://svnbook.red-bean.com/en/1.4