Changes between Version 39 and Version 40 of Developers/SVN_QuickReference

Timestamp:

2018-06-05T01:44:29+02:00 (6 years ago)

Author:

nicolasmartin

Comment:

--

Developers/SVN_QuickReference

@@ -1 @@
-= SubVersioN basics
+= SubVersioN basics customized for NEMO
 
 [[PageOutline(2-3)]]
@@ -13 +13 @@
 === Create a branch
 
-For development branches, we tend to add one level of subdirectory corresponding to the current year, and an additional item in the name corresponding to the work-plan. For instance
+For development branches, we tend to add one level of subdirectory corresponding to the current year, and an additional item in the name corresponding to the workplan. For branch naming conventions, see [wiki:Developers/DevelopingCodeChanges].
 
 {{{#!sh
@@ -19 +19 @@
 }}}
 
-For branch naming conventions, see [wiki:Developers/DevelopingCodeChanges].
-
 === Switch to the trunk (hazardous)
 
-Your working copy was based on a given branch which has been moved to the trunk (conflicts unavoidable and pretty complicated to resolve).
+Your working copy was based on a given branch and you want to mirror a new branch, conflicts unavoidable and pretty complicated to resolve.
 
 {{{#!sh
-svn switch http://forge.ipsl.jussieu.fr/nemo/svn/NEMO/trunk
+svn sw 'URL[@PEGREV] [PATH]'
 }}}
 
@@ -42 +40 @@
 
 {{{#!sh
-svn copy trunk/src/OCE/module_example branches/'Current_year'/'dev_branch'/'path/to/the'/new_routine.f90
+svn copy trunk/src/OCE/module_example branches/'Current_year'/'dev_branch'/'path/to/the/new/routine.{f90, F90, h90}'
 }}}
 
-=== Add a new file / Remove a file
+{{{#!comment
+Explanation missing for available extensions
+}}}
+
+=== Add a new item / Remove a [remote] item
 
 {{{#!sh
-svn add 'Path/to/the/file/to/add'
-svn del 'Path/to/the/file/to/delete'
+svn add 'PATH...'
+svn del '{PATH..., URL...}'
 }}}
 
-=== Update file between branches
-
-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:
-
-{{{#!sh
-cd ./modeles/NEMO/OPA_SRC/SBC/
-svn merge -r 1196:1214 http://forge.ipsl.jussieu.fr/nemo/svn/trunk/NEMO/OPA_SRC/SBC/sbcssm.F90
-}}}
-
-== Manage versioned properties
+== Manage versioned properties on items
 
 === `svn:keywords` for commit infos
@@ -68 +61 @@
 
 {{{#!sh
-svn pset svn:keywords Id 'path/to/the'/new_routine.'{f90, F90, h90, sh}'
+svn pset svn:keywords Id 'path/to/the/new/routine.{f90, F90, h90, sh}'
 }}}
 
@@ -76 +69 @@
 If you want to apply a specific 
 
-=== `svn:executable` for scripts
+=== `svn:executable` for shell scripts
 
 {{{#!sh
@@ -86 +79 @@
 }}}
 
-
-=== `svn:externals` for 
+=== `svn:externals` for external sources
 
 
 == Merging
+
+=== Update item between branches
+
+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:
+
+{{{#!sh
+svn merge 'sourceWCPATH1@REV1 sourceWCPATH2@REV2 [WCPATH]'
+}}}
 
 To get all changes from the revision 746 to the current one (HEAD) on a specific directory
@@ -101 +101 @@
 }}}
 
-== Commit changes to the repository
+== Revert local changes / Commit changes to the repository
+
+
 
 {{{#!sh
@@ -140 +142 @@
 }}}
 
+=== Push modified external items from a  working copy
+
+Use explicit option with SVN commit command, '''think that no revision has to be set on related ext def (equivalent to `@HEAD`)'''
+
+{{{#!sh
+svn ci --include-externals ... 
+}}}
+
 === Information about the sources
 
@@ -153 +163 @@
 cd ./NEMO && svn log --verbose --stop-on-copy
 }}}
+
+With the new layout of the repository, some may encounter downloading or updating issues with 
+
+{{{#!sh
+svn co -r REV URL
+}}}
+
+Use instead the more robust syntax
+
+{{{#!sh
+svn co URL@PEG (REV ~ PEG)
+}}}
+
+See ​http://svnbook.red-bean.com/en/1.7/svn.advanced.pegrevs.html for more.