Changes between Version 40 and Version 41 of Developers/SVN_Quick Reference


Ignore:
Timestamp:
2018-06-05T02:09:29+02:00 (2 years ago)
Author:
nicolasmartin
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • Developers/SVN_Quick Reference

    v40 v41  
    1919}}} 
    2020 
    21 === Switch to the trunk (hazardous) 
     21=== Mirror a different branch (hazardous) 
    2222 
    23 Your working copy was based on a given branch and you want to mirror a new branch, conflicts unavoidable and pretty complicated to resolve. 
     23Your working copy was based on your initial dev. branch and you want to update to a different branch, conflicts are unavoidable and will be pretty complicated to resolve. 
    2424 
    2525{{{#!sh 
     
    2727}}} 
    2828 
    29 === Delete a branch 
    30  
    31 {{{#!sh 
    32 svn del 'Path/to/the/branch/to/delete' 
    33 }}} 
    34  
    35 == Manage versioned items (file / folder) 
     29== Manage versioned items 
    3630 
    3731=== Add a new NEMO routine 
     
    5145{{{#!sh 
    5246svn add 'PATH...' 
    53 svn del '{PATH..., URL...}' 
     47svn del '{PATH...,URL...}' 
    5448}}} 
    5549 
    5650== Manage versioned properties on items 
    5751 
    58 === `svn:keywords` for commit infos 
     52=== `svn:keywords` for commit infos on routines 
    5953 
    6054If the `svn:keywords` property is not defined on a NEMO routine, set it in order to get the functionality of `$Id` keyword replacement in all committed files with the commit informations (URL, author, date and revision) 
    6155 
    6256{{{#!sh 
    63 svn pset svn:keywords Id 'path/to/the/new/routine.{f90, F90, h90, sh}' 
     57svn pset svn:keywords Id 'PATH...' 
    6458}}} 
    6559 
    66 === `svn:mime-type` for syntax highlighting 
     60=== `svn:mime-type` for syntax highlighting and merging process 
    6761 
    6862Most of versioned files \\ 
    6963If you want to apply a specific  
    7064 
    71 === `svn:executable` for shell scripts 
     65=== `svn:executable` for access permissions of shell scripts 
    7266 
    7367{{{#!sh 
    74 svn pset svn:executable 'path/to/the/script'.sh 
     68svn {pset,pdel} svn:executable 'PATH...' 
    7569}}} 
    7670 
     71=== `svn:externals` for defining external sources 
     72 
     73 
     74 
     75== Revert local changes 
     76 
    7777{{{#!sh 
    78 svn pdel svn:executable 'path/to/the/script'.sh 
     78svn revert [--depth {empty,files,immediates,infinity}] 'PATH...' 
    7979}}} 
    8080 
    81 === `svn:externals` for external sources 
    8281 
     82== Merging sources 
    8383 
    84 == Merging 
    85  
    86 === Update item between branches 
    87  
    88 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: 
     84Apply the differences between two sources to a working copy path 
    8985 
    9086{{{#!sh 
     
    9288}}} 
    9389 
    94 To get all changes from the revision 746 to the current one (HEAD) on a specific directory 
    95  
    96 {{{#!sh 
    97 # (you have already downloaded the branch you are working on) 
    98 cd ./NEMO/OPA_SRC/IOM 
    99 svn merge -r 746:HEAD -m 'Merge my local IOM directory with the trunk repository'                               \ 
    100           svn+ssh://'your_forge_login'@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk/NEMO/OPA_SRC/IOM \ 
    101 }}} 
    102  
    103 == Revert local changes / Commit changes to the repository 
    104  
    105  
     90== Commit changes to the repository 
    10691 
    10792{{{#!sh