Differences

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

--- noresm:svntutorial [2013-12-10 13:48:49]
alfg [SVN TUTORIAL BRANCH/MERGE TUTORIAL]
+++ noresm:svntutorial [2022-05-31 09:29:32]
@@ Line 1: / Line 1: @@
-======SVN Branch/Merge tutorial ======
-NOTE: THE EXAMPLES ARE DONE ON ALFS PC, AND ANY DIRECTORY NAMES CONTAINING
-"alfg" ARE NOT VALID ON YOUR PC!! USE SOME NAMES WHICH MAKE SENSE ON YOUR PC!
-===== PART 1 : Create a repository and put a file there =====
-CREATE A REPOSITORY
-<file>
-alfg@pc4400:~$svnadmin create $HOME/svnrepos
-</file>
-CREATE A WORKING DIRECTORY WITH CODE
-<file>
-alfg@pc4400:~$mkdir $HOME/testproject
-</file>
-Use the following as the file test.F90:
-<file>
-program test
-    implicit none
-    real, parameter :: a=4.0
-    real, parameter :: b=5.0
-    print*, "a is " , a
-    print*, "b is " , b
-    print*, "a+b is " , a+b
-end program test
-</file>
-CD TO WORKING DIRECTORY AND VERIFY THAT THE TEST FILE IS THERE
-<file>
-alfg@pc4400:~/testproject$ ls -l
-total 4
--rw-rw-r-- 1 alfg alfg 166 Dec  6 14:51 test.F90
-</file>
-CD TO THE FRESHLY CREATED REPOSITORY AND CREATE "testproject"
-<file>
-alfg@pc4400:~/svnrepos$ svnadmin create testproject
-</file>
-IMPORT YOUR WORKING-DIRECTORY TO THE REPOSITORY
-<file>
-alfg@pc4400:~$svn import $HOME/testproject/ file://$HOME/svnrepos/testproject/trunk -m "Initial version of testproject"
-</file>
-MAKE A BRANCHES-DIRECTORY
-<file>
-alfg@pc4400:~$svn mkdir file://$HOME/svnrepos/testproject/branches/ -m "created branches directory"
-</file>
-==> YOU NOW HAVE A REPOSITORY CONTAINING TRUNK AND (EMPTY) BRANCHES DIRECTORY. YOU CAN START TO USE IT
-===== PART 2: CREATE A DIRECTORY FOR TWO DEVELOPERS (one working on trunk and other on branch)
-BOTH DEVELOPERS SHOULD BE CONNECTED TO THE SVN REPOSITORY ====