Changes between Version 53 and Version 54 of Developers/SVN_Quick Reference


Ignore:
Timestamp:
2018-11-09T02:08:58+01:00 (23 months ago)
Author:
nicolasmartin
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • Developers/SVN_Quick Reference

    v53 v54  
    44 
    55[[PageOutline(2-3)]] 
     6 
     7__For reference, browse to http://svnbook.red-bean.com__ 
    68 
    79{{{#!sh 
     
    4850}}} 
    4951{{{#!td 
    50 Apply the differences between two sources to a working copy path 
     52Apply the differences between two sources to a target path 
    5153 
    5254   {{{#!sh 
    53    $ svn merge {${URL1},${WCPATH1}}[@${REV1}] {${URL1},${WCPATH2}}[@${REV2}] [${WCPATH}] 
     55   $ svn merge {${URL1},${WCPATH1}}[@${REV1}] [{${URL1},${WCPATH2}}[@${REV2}]] [${WCPATH}] 
    5456   }}} 
    5557}}} 
     
    9597{{{#!td 
    9698   {{{#!sh 
    97    $ svn revert  ${WCPATH} 
     99   $ svn revert ${WCPATH} 
    98100   }}} 
    99101}}} 
     
    105107Common way 
    106108   {{{#!sh 
    107    $ svn ci [-m 'log message in one line'] items 
     109   $ svn ci [-m 'log message in one line'] ${WCPATH} 
    108110   }}} 
    109111 
     
    112114 
    113115  {{{#!sh 
    114   $ svn ci --include-externals ...  
     116  $ svn ci --include-externals ${WCPATH} 
    115117  }}} 
    116118}}} 
     
    118120== Manage versioned SVN properties on items 
    119121 
    120 === Set properties 
    121  
    122122{{{#!th 
    123 `svn:keywords`: log record of last commit in routine 
     123Set properties 
    124124}}} 
    125125{{{#!td 
     126`svn:keywords`: log record of last commit in routine 
    126127   {{{#!sh 
    127128   $ svn propset svn:keywords Id on ${WCPATH} 
     129   }}} 
     130`svn:mime-type`: syntax highlighting and merging process 
     131 
     132`svn:executable`: executable permissions of shell scripts 
     133   {{{#!sh 
     134   $ svn propset svn:executable on ${WCPATH} 
     135   }}} 
     136`svn:externals`: defining external sources 
     137 Single external example 
     138   {{{#!sh 
     139   $ svn propset svn:externals ${URL}[@${REV}] ${WCPATH} 
     140   }}} 
     141 Multi externals example using an editor 
     142   {{{#!sh 
     143   $ svn propedit svn:externals ${WCPATH} 
    128144   }}} 
    129145}}} 
    130146|- 
    131147{{{#!th 
    132 `svn:mime-type`: syntax highlighting and merging process 
    133 }}} 
    134 {{{#!td 
    135  
    136 }}} 
    137 |- 
    138 {{{#!th 
    139 `svn:executable`: executable permissions of shell scripts 
     148Delete property 
    140149}}} 
    141150{{{#!td 
    142151   {{{#!sh 
    143    $ svn propset svn:executable on ${WCPATH} 
     152   $ svn propdel ${SVN_PROPERTY} ${WCPATH} 
    144153   }}} 
    145154}}} 
    146 |- 
    147 {{{#!th 
    148 `svn:externals`: defining external sources 
    149 }}} 
    150 {{{#!td 
    151 Single external example 
    152    {{{#!sh 
    153    $ svn propset svn:externals ${URL}[@${REV}] ${WCPATH} 
    154    }}} 
    155 Multi externals example using an editor 
    156    {{{#!sh 
    157    $ svn propedit svn:externals ${WCPATH} 
    158    }}} 
    159 }}} 
    160  
    161 === Delete a property 
    162  
    163 {{{#!sh 
    164 $ svn propdel ${SVN_PROPERTY} ${WCPATH} 
    165 }}}