Changes between Version 40 and Version 41 of Developers/SVN_QuickReference
- Timestamp:
- 2018-06-05T02:09:29+02:00 (7 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Developers/SVN_QuickReference
v40 v41 19 19 }}} 20 20 21 === Switch to the trunk(hazardous)21 === Mirror a different branch (hazardous) 22 22 23 Your working copy was based on a given branch and you want to mirror a new branch, conflicts unavoidable andpretty complicated to resolve.23 Your 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. 24 24 25 25 {{{#!sh … … 27 27 }}} 28 28 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 36 30 37 31 === Add a new NEMO routine … … 51 45 {{{#!sh 52 46 svn add 'PATH...' 53 svn del '{PATH..., 47 svn del '{PATH...,URL...}' 54 48 }}} 55 49 56 50 == Manage versioned properties on items 57 51 58 === `svn:keywords` for commit infos 52 === `svn:keywords` for commit infos on routines 59 53 60 54 If 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) 61 55 62 56 {{{#!sh 63 svn pset svn:keywords Id ' path/to/the/new/routine.{f90, F90, h90, sh}'57 svn pset svn:keywords Id 'PATH...' 64 58 }}} 65 59 66 === `svn:mime-type` for syntax highlighting 60 === `svn:mime-type` for syntax highlighting and merging process 67 61 68 62 Most of versioned files \\ 69 63 If you want to apply a specific 70 64 71 === `svn:executable` for shell scripts65 === `svn:executable` for access permissions of shell scripts 72 66 73 67 {{{#!sh 74 svn pset svn:executable 'path/to/the/script'.sh68 svn {pset,pdel} svn:executable 'PATH...' 75 69 }}} 76 70 71 === `svn:externals` for defining external sources 72 73 74 75 == Revert local changes 76 77 77 {{{#!sh 78 svn pdel svn:executable 'path/to/the/script'.sh78 svn revert [--depth {empty,files,immediates,infinity}] 'PATH...' 79 79 }}} 80 80 81 === `svn:externals` for external sources82 81 82 == Merging sources 83 83 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: 84 Apply the differences between two sources to a working copy path 89 85 90 86 {{{#!sh … … 92 88 }}} 93 89 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 106 91 107 92 {{{#!sh