Changes between Version 8 and Version 9 of Developers/SVN_Quick Reference


Ignore:
Timestamp:
2011-05-05T15:31:27+02:00 (10 years ago)
Author:
clevy
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • Developers/SVN_Quick Reference

    v8 v9  
    11[[PageOutline]] 
    2 = '''Working with SVN and tickets'' =   
    3 [[BR]] 
    42 
     3= '''Working with SVN and tickets''''''' = 
    54Last edited [[Timestamp]] 
    6  
    75 
    86---- 
     
    108Send a request once for all to Rachid with your nemo website user name 
    119 
     10== How to make a branch == 
     11For branch naming conventions, see https://forge.ipsl.jussieu.fr/nemo/wiki/Developers/WorkingPractices#CreateaBranch 
    1212 
    13  == How to make a branch == 
    1413{{{ 
    1514svn 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" 
    1615}}} 
    1716For 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 
    1818{{{ 
    1919svn 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" 
    2020}}} 
     21== How to make a commit == 
     22Extract with svn+http protocol 
    2123 
    22  
    23  == How to make a commit == 
    24 Extract with svn+http protocol 
    2524{{{ 
    2625svn co svn+ssh://yourloginforge@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/dev_001_SBC 
    2726}}} 
     27Then 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) 
    2828 
    29 Then in the appropriate directory : 
    30 export SVN_EDITOR=vi      (ksh, bash, to put in .profile or .bash_profile) 
    31 or 
    32 setenv SVN_EDITOR vi        (tsch, to put in .login) 
    3329{{{ 
    3430svn ci  -m [ "bla bla ...., see ticket:# ] [ files list ] 
    3531}}} 
    36  
    37  == How to make a tag == 
     32== How to make a tag == 
    3833{{{ 
    3934svn 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" 
    4035}}} 
     36== How to make a merge == 
     37To get all changes from the revision 746 to the current one (HEAD) on a specific directory 
    4138 
    42  == How to make a merge == 
    43 To get all changes from the revision 746 to the current one (HEAD) on a specific directory 
    4439{{{ 
    4540cd ./NEMO/OPA_SRC/IOM (you already downloaded the branche you are working on) 
    4641svn 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 " 
    4742}}} 
     43== How to make an update of a given file between 2 different branches e.g trunk and tags directories == 
     44Suppose 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: 
    4845 
    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: 
    5246{{{ 
    5347cd ./modeles/NEMO/OPA_SRC/SBC/ 
    5448svn merge -r 1196:1214 http://forge.ipsl.jussieu.fr/nemo/svn/trunk/NEMO/OPA_SRC/SBC/sbcssm.F90 
    5549}}} 
    56  
    57  
    5850== How to get information about the sources downloaded == 
    5951To get information such as the PATH/URL you are working on, .i.e. trunk, branches .. and so on 
     52 
    6053{{{ 
    6154cd ./NEMO 
     
    6356}}} 
    6457To get all commits/''revision'' performed/''associated'' on/''to'' your working repository since its creation 
     58 
    6559{{{ 
    6660cd ./NEMO 
    6761svn log --verbose --stop-on-copy 
    6862}}} 
    69  
    7063== Switch from user to developer == 
    7164{{{ 
     
    7366 
    7467}}} 
    75  
    76 == How to create a ticket wiki page ==  
     68== How to create a ticket wiki page == 
    7769In 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 
    7870 
    79 == How to create a review wiki page ==  
     71== How to create a review wiki page == 
    8072In 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 
    8173 
    8274---- 
    83