New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Developers/SVN_QuickReference (diff) – NEMO

Changes between Version 56 and Version 57 of Developers/SVN_QuickReference


Ignore:
Timestamp:
2018-11-09T22:29:26+01:00 (5 years ago)
Author:
nicolasmartin
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Developers/SVN_QuickReference

    v56 v57  
    1 = SubVersioN basics 
     1= SVN quick reference 
    22 
    33Last edition on '''[[Wikinfo(changed_ts)]]''' by '''[[Wikinfo(changed_by)]]''' 
    44 
    5 [[PageOutline(2-3)]] 
    6  
    7 __For reference, browse to http://svnbook.red-bean.com__ 
     5__For reference, browse to__ http://svnbook.red-bean.com 
    86 
    97{{{#!sh 
    … …  
    2018}}} 
    2119 
    22 == Versioning 
    23  
    2420{{{#!th 
    25 !Add/Remove item \\ 
    26 (file or folder) 
     21== Basic use 
     22}}} 
     23{{{#!th 
     24== Properties 
     25}}} 
     26{{{#!th 
     27== Branching / Merging 
     28}}} 
     29|- 
     30{{{#!td 
     31Download a working copy 
     32   {{{#!sh 
     33   $ svn {checkout,co} [${WCPATH}] 
     34   }}} 
     35!Add/Remove item (file or folder) 
     36   {{{#!sh 
     37   $ svn {add,del,rm} ${WCPATH} 
     38   }}} 
     39Informations on working copy 
     40   {{{#!sh 
     41   $ svn info [{${WCPATH},${URL}}][@${REV}] 
     42   }}} 
     43Local status wrt the repository 
     44   {{{#!sh 
     45   $ svn status [-[qu]] [${WCPATH}] 
     46   }}} 
     47Local changes 
     48   {{{#!sh 
     49   $ svn {diff,revert} ${WCPATH} 
     50   }}} 
     51Push modififcations to repository 
     52   {{{#!sh 
     53   $ svn {ci,commit} [-m 'one-liner message'] [${WCPATH}] 
     54   }}} 
     55 For modified externals, add `--include-externals` option 
     56List commit messages 
     57   {{{#!sh 
     58   $ svn log [{${URL},${WCPATH}}[@${REV}]] 
     59   }}} 
    2760}}} 
    2861{{{#!td 
    29    {{{#!sh 
    30    $ svn {add,del} ${WCPATH} 
    31    }}} 
    32 }}} 
    33 |- 
    34 {{{#!th 
    35 Working copy 
    36 }}} 
    37 {{{#!td 
    38 Display information about a local or remote item 
    39  
    40 {{{#!sh 
    41 $ svn info [{${WCPATH},${URL}}][@${REV}] 
    42 }}} 
    43  
    44 Display the current state of the working path wrt the one mirrored in the repository 
    45  
    46 {{{#!sh 
    47 $ svn status [-[qu]] [${WCPATH}] 
    48 }}} 
    49  
    50 Display all commits performed to your working path since its creation 
    51  
    52 {{{#!sh 
    53 $ svn log --verbose --stop-on-copy [${WCPATH}] 
    54 }}} 
    55 }}} 
    56 |- 
    57 {{{#!th 
    58 Revert changes \\ 
    59 (local) 
    60 }}} 
    61 {{{#!td 
    62    {{{#!sh 
    63    $ svn revert ${WCPATH} 
    64    }}} 
    65 }}} 
    66 |- 
    67 {{{#!th 
    68 Push changes 
    69 }}} 
    70 {{{#!td 
    71    {{{#!sh 
    72    $ svn ci [-m 'one-liner log message'] [${WCPATH}] 
    73    }}} 
    74 For modified externals, add `--include-externals` option 
    75 }}} 
    76  
    77 == Properties 
    78  
    79 {{{#!th 
    80 Set properties 
    81 }}} 
    82 {{{#!td 
    83 `svn:keywords Id`: log record of last commit in routine 
     62`svn:keywords Id`: record commit infos in routine 
    8463   {{{#!sh 
    8564   $ svn propset svn:keywords Id on ${WCPATH} 
    8665   }}} 
    8766`svn:mime-type`: syntax highlighting and merging process 
    88  
    89 `svn:executable`: executable permissions of shell scripts 
     67   {{{#!sh 
     68   $ svn propset svn:mime-type ... ${WCPATH} 
     69   }}} 
     70`svn:executable`: set permissions for scripts 
    9071   {{{#!sh 
    9172   $ svn propset svn:executable on ${WCPATH} 
    9273   }}} 
    9374`svn:externals`: defining external sources 
    94  Single external example 
     75- Single external 
    9576   {{{#!sh 
    9677   $ svn propset svn:externals ${URL}[@${REV}] ${WCPATH} 
    9778   }}} 
    98  Multi externals example using an editor 
     79- Multi externals 
    9980   {{{#!sh 
    10081   $ svn propedit svn:externals ${WCPATH} 
    10182   }}} 
    10283}}} 
    103 |- 
    104 {{{#!th 
    105 Delete property 
    106 }}} 
    10784{{{#!td 
    108    {{{#!sh 
    109    $ svn propdel ${SVN_PROPERTY} ${WCPATH} 
    110    }}} 
    111 }}} 
    112  
    113 == Branching / Merging 
    114  
    115 {{{#!th 
    116 Manage \\ 
    117 branches 
    118 }}} 
    119 {{{#!td 
    120 Creation 
     85Create a branch (copying) 
    12186   {{{#!sh 
    12287   $ svn copy {${URL},${WCPATH}}[@${REV}] {${URL},${WCPATH}} 
    12388   }}} 
    12489Update WC to a new URL 
    125  Mirror a different branch $i.e$ traversing branch in the same repository (__hazardous!! __) 
     90- Mirror a different branch $i.e$ traversing branch in the same repository (__hazardous!! __) 
    12691   {{{#!sh 
    12792   $ svn switch ${URL}[@${REV}] [${WCPATH}] 
    12893   }}} 
    129  Relocate to a different URL $i.e$ keep the same branch but move to a new server or URL scheme 
     94- Relocate to a different URL $i.e$ keep the same branch but move to a new server or URL scheme 
    13095   {{{#!sh 
    13196   $ svn switch --relocate ${URL1} ${URL2} 
    13297   }}} 
    133 Removal 
     98Merging sources 
     99   {{{#!sh 
     100   $ svn merge {${URL1},${WCPATH1}}[@${REV1}] [{${URL1},${WCPATH2}}[@${REV2}]] [${WCPATH}] 
     101   }}} 
     102Remove a branch 
    134103   {{{#!sh 
    135104   $ svn rm {${URL},${WCPATH}} 
    136105   }}} 
    137106}}} 
    138 |- 
    139 {{{#!th 
    140 Merging \\ 
    141 sources 
    142 }}} 
    143 {{{#!td 
    144    {{{#!sh 
    145    $ svn merge {${URL1},${WCPATH1}}[@${REV1}] [{${URL1},${WCPATH2}}[@${REV2}]] [${WCPATH}] 
    146    }}} 
    147 }}} 
    148