Changes between Version 55 and Version 56 of Developers/SVN_Quick Reference


Ignore:
Timestamp:
2018-11-09T21:30:13+01:00 (23 months ago)
Author:
nicolasmartin
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • Developers/SVN_Quick Reference

    v55 v56  
    1010## Definitions 
    1111 
    12 ${REV} # SVN revision number 
     12${REV} # REVision number 
    1313 
    14 ${URL} # web address of a path in the SVN repository (URL scheme + relative path in the repository) 
    15 ## URL scheme depends on your role 
     14${URL} # web address of a path in the SVN repository (repository URL + relative path in the repository) 
     15## Repository URL depends on your role 
    1616##- user:        http://forge.ipsl.jussieu.fr/nemo/svn 
    1717##- developer svn+ssh://${ID}@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn 
     
    2020}}} 
    2121 
    22 == !Branching/Merging 
     22== Versioning 
    2323 
    2424{{{#!th 
    25 Create a branch 
    26 }}} 
    27 {{{#!td 
    28    {{{#!sh 
    29    $ svn copy {${URL},${WCPATH}}[@${REV}] {${URL},${WCPATH}} 
    30    }}} 
    31 }}} 
    32 |- 
    33 {{{#!th 
    34 Update to a different URL 
    35 }}} 
    36 {{{#!td 
    37 Mirror a different branch $i.e$ traversing branch in the same repository (__hazardous!! __) 
    38    {{{#!sh 
    39    $ svn switch ${URL}[@${REV}] [${WCPATH}] 
    40    }}} 
    41  
    42 Relocate to a different URL $i.e$ keep the same branch but move to a new server or URL scheme 
    43    {{{#!sh 
    44    $ svn switch --relocate ${URL1}[@${REV1}] ${URL2}[@${REV2}] 
    45    }}} 
    46 }}} 
    47 |- 
    48 {{{#!th 
    49 Merging sources 
    50 }}} 
    51 {{{#!td 
    52 Apply the differences between two sources to a target path 
    53  
    54    {{{#!sh 
    55    $ svn merge {${URL1},${WCPATH1}}[@${REV1}] [{${URL1},${WCPATH2}}[@${REV2}]] [${WCPATH}] 
    56    }}} 
    57 }}} 
    58  
    59 == Versioned items 
    60  
    61 {{{#!th 
    62 !Add/Remove a item \\ 
     25!Add/Remove item \\ 
    6326(file or folder) 
    6427}}} 
     
    7033|- 
    7134{{{#!th 
    72 Info / Status / Log 
     35Working copy 
    7336}}} 
    7437{{{#!td 
     
    8851 
    8952{{{#!sh 
    90 $ svn log --verbose --stop-on-copy ${WCPATH} 
     53$ svn log --verbose --stop-on-copy [${WCPATH}] 
    9154}}} 
    9255}}} 
    9356|- 
    9457{{{#!th 
    95 Revert local changes 
     58Revert changes \\ 
     59(local) 
    9660}}} 
    9761{{{#!td 
     
    10569}}} 
    10670{{{#!td 
    107 Common way 
    10871   {{{#!sh 
    109    $ svn ci [-m 'log message in one line'] ${WCPATH} 
     72   $ svn ci [-m 'one-liner log message'] [${WCPATH}] 
    11073   }}} 
    111  
    112 Push modified external items with explicit option \\ 
    113 (__no revision or `@HEAD` has been set on related external definition)__ 
    114  
    115   {{{#!sh 
    116   $ svn ci --include-externals ${WCPATH} 
    117   }}} 
     74For modified externals, add `--include-externals` option 
    11875}}} 
    11976 
    120 == SVN properties 
     77== Properties 
    12178 
    12279{{{#!th 
     
    12481}}} 
    12582{{{#!td 
    126 `svn:keywords`: log record of last commit in routine 
     83`svn:keywords Id`: log record of last commit in routine 
    12784   {{{#!sh 
    12885   $ svn propset svn:keywords Id on ${WCPATH} 
     
    153110   }}} 
    154111}}} 
     112 
     113== Branching / Merging 
     114 
     115{{{#!th 
     116Manage \\ 
     117branches 
     118}}} 
     119{{{#!td 
     120Creation 
     121   {{{#!sh 
     122   $ svn copy {${URL},${WCPATH}}[@${REV}] {${URL},${WCPATH}} 
     123   }}} 
     124Update WC to a new URL 
     125 Mirror a different branch $i.e$ traversing branch in the same repository (__hazardous!! __) 
     126   {{{#!sh 
     127   $ svn switch ${URL}[@${REV}] [${WCPATH}] 
     128   }}} 
     129 Relocate to a different URL $i.e$ keep the same branch but move to a new server or URL scheme 
     130   {{{#!sh 
     131   $ svn switch --relocate ${URL1} ${URL2} 
     132   }}} 
     133Removal 
     134   {{{#!sh 
     135   $ svn rm {${URL},${WCPATH}} 
     136   }}} 
     137}}} 
     138|- 
     139{{{#!th 
     140Merging \\ 
     141sources 
     142}}} 
     143{{{#!td 
     144   {{{#!sh 
     145   $ svn merge {${URL1},${WCPATH1}}[@${REV1}] [{${URL1},${WCPATH2}}[@${REV2}]] [${WCPATH}] 
     146   }}} 
     147}}} 
     148