Changes between Version 55 and Version 56 of Developers/SVN_QuickReference
- Timestamp:
- 2018-11-09T21:30:13+01:00 (6 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Developers/SVN_QuickReference
v55 v56 10 10 ## Definitions 11 11 12 ${REV} # SVN revision number12 ${REV} # REVision number 13 13 14 ${URL} # web address of a path in the SVN repository ( URL scheme+ relative path in the repository)15 ## URL schemedepends on your role14 ${URL} # web address of a path in the SVN repository (repository URL + relative path in the repository) 15 ## Repository URL depends on your role 16 16 ##- user: http://forge.ipsl.jussieu.fr/nemo/svn 17 17 ##- developer svn+ssh://${ID}@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn … … 20 20 }}} 21 21 22 == !Branching/Merging22 == Versioning 23 23 24 24 {{{#!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 \\ 63 26 (file or folder) 64 27 }}} … … 70 33 |- 71 34 {{{#!th 72 Info / Status / Log 35 Working copy 73 36 }}} 74 37 {{{#!td … … 88 51 89 52 {{{#!sh 90 $ svn log --verbose --stop-on-copy ${WCPATH}53 $ svn log --verbose --stop-on-copy [${WCPATH}] 91 54 }}} 92 55 }}} 93 56 |- 94 57 {{{#!th 95 Revert local changes 58 Revert changes \\ 59 (local) 96 60 }}} 97 61 {{{#!td … … 105 69 }}} 106 70 {{{#!td 107 Common way108 71 {{{#!sh 109 $ svn ci [-m ' log message in one line'] ${WCPATH}72 $ svn ci [-m 'one-liner log message'] [${WCPATH}] 110 73 }}} 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 }}} 74 For modified externals, add `--include-externals` option 118 75 }}} 119 76 120 == SVN properties77 == Properties 121 78 122 79 {{{#!th … … 124 81 }}} 125 82 {{{#!td 126 `svn:keywords `: log record of last commit in routine83 `svn:keywords Id`: log record of last commit in routine 127 84 {{{#!sh 128 85 $ svn propset svn:keywords Id on ${WCPATH} … … 153 110 }}} 154 111 }}} 112 113 == Branching / Merging 114 115 {{{#!th 116 Manage \\ 117 branches 118 }}} 119 {{{#!td 120 Creation 121 {{{#!sh 122 $ svn copy {${URL},${WCPATH}}[@${REV}] {${URL},${WCPATH}} 123 }}} 124 Update 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 }}} 133 Removal 134 {{{#!sh 135 $ svn rm {${URL},${WCPATH}} 136 }}} 137 }}} 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