Changes between Version 8 and Version 9 of Developers/SVN_QuickReference
- Timestamp:
- 2011-05-05T15:31:27+02:00 (13 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Developers/SVN_QuickReference
v8 v9 1 1 [[PageOutline]] 2 = '''Working with SVN and tickets'' =3 [[BR]]4 2 3 = '''Working with SVN and tickets''''''' = 5 4 Last edited [[Timestamp]] 6 7 5 8 6 ---- … … 10 8 Send a request once for all to Rachid with your nemo website user name 11 9 10 == How to make a branch == 11 For branch naming conventions, see https://forge.ipsl.jussieu.fr/nemo/wiki/Developers/WorkingPractices#CreateaBranch 12 12 13 == How to make a branch ==14 13 {{{ 15 14 svn copy svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/dev_r1720_SBC -m "Create a specific branch for the New Surface Module" 16 15 }}} 17 16 For development branches, we tend to add one level of subdirectory corresponding to the current year, and an additional item in the name corresponding to the work-plan,for instance: 17 18 18 {{{ 19 19 svn copy svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r1720_LOCEAN1_mpp -m "Create a specific branch for mpp evolution" 20 20 }}} 21 == How to make a commit == 22 Extract with svn+http protocol 21 23 22 23 == How to make a commit ==24 Extract with svn+http protocol25 24 {{{ 26 25 svn co svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/dev_001_SBC 27 26 }}} 27 Then in the appropriate directory : export SVN_EDITOR=vi (ksh, bash, to put in .profile or .bash_profile) or setenv SVN_EDITOR vi (tsch, to put in .login) 28 28 29 Then in the appropriate directory :30 export SVN_EDITOR=vi (ksh, bash, to put in .profile or .bash_profile)31 or32 setenv SVN_EDITOR vi (tsch, to put in .login)33 29 {{{ 34 30 svn ci -m [ "bla bla ...., see ticket:# ] [ files list ] 35 31 }}} 36 37 == How to make a tag == 32 == How to make a tag == 38 33 {{{ 39 34 svn copy svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/tags/nemo_v2_3 -m "Tagging nemo_v2_3" 40 35 }}} 36 == How to make a merge == 37 To get all changes from the revision 746 to the current one (HEAD) on a specific directory 41 38 42 == How to make a merge ==43 To get all changes from the revision 746 to the current one (HEAD) on a specific directory44 39 {{{ 45 40 cd ./NEMO/OPA_SRC/IOM (you already downloaded the branche you are working on) 46 41 svn merge -r 746:HEAD svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/NEMO/OPA_SRC/IOM -m "Merge my local IOM directory with the trunk repository " 47 42 }}} 43 == How to make an update of a given file between 2 different branches e.g trunk and tags directories == 44 Suppose the downloaded NEMO directory corresponds to the tag nemo_v3 (i.e. from http://forge.ipsl.jussieu.fr/nemo/svn/tags/nemo_v3/NEMO); the current revision number of the file sbcssm.F90 is 1196. To get the new revision (which has been committed on the trunk http://forge.ipsl.jussieu.fr/nemo/svn/trunk/NEMO ) with the revision number 1214: 48 45 49 == How to make an update of a given file between 2 different branches e.g trunk and tags directories ==50 Suppose the downloaded NEMO directory corresponds to the tag nemo_v3 (i.e. from http://forge.ipsl.jussieu.fr/nemo/svn/tags/nemo_v3/NEMO); the current revision number of the file sbcssm.F90 is 1196.51 To get the new revision (which has been committed on the trunk http://forge.ipsl.jussieu.fr/nemo/svn/trunk/NEMO ) with the revision number 1214:52 46 {{{ 53 47 cd ./modeles/NEMO/OPA_SRC/SBC/ 54 48 svn merge -r 1196:1214 http://forge.ipsl.jussieu.fr/nemo/svn/trunk/NEMO/OPA_SRC/SBC/sbcssm.F90 55 49 }}} 56 57 58 50 == How to get information about the sources downloaded == 59 51 To get information such as the PATH/URL you are working on, .i.e. trunk, branches .. and so on 52 60 53 {{{ 61 54 cd ./NEMO … … 63 56 }}} 64 57 To get all commits/''revision'' performed/''associated'' on/''to'' your working repository since its creation 58 65 59 {{{ 66 60 cd ./NEMO 67 61 svn log --verbose --stop-on-copy 68 62 }}} 69 70 63 == Switch from user to developer == 71 64 {{{ … … 73 66 74 67 }}} 75 76 == How to create a ticket wiki page == 68 == How to create a ticket wiki page == 77 69 In your browser, open https://forge.ipsl.jussieu.fr/nemo/wiki/ticket/xxxx with xxxx the ticket number and choose NEMOTicketTemplate or in your ticket add the markup wiki:ticket/xxxx and follow the link 78 70 79 == How to create a review wiki page == 71 == How to create a review wiki page == 80 72 In your browser, open https://forge.ipsl.jussieu.fr/nemo/wiki/ticket/xxxx/Review with xxxx the ticket number and choose NEMOReviewTemplate or in your ticket add the markup wiki:ticket/xxxx/Review and follow the link 81 73 82 74 ---- 83