Changes between Version 57 and Version 58 of Developers/SVN_QuickReference

Timestamp:

2018-11-11T22:12:05+01:00 (5 years ago)

Author:

nicolasmartin

Comment:

--

Developers/SVN_QuickReference

@@ -5 +5 @@
 __For reference, browse to__ http://svnbook.red-bean.com
 
+{{{#!box width=60em
 {{{#!sh
 ## Definitions
-
-${REV} # REVision number
-
-${URL} # web address of a path in the SVN repository (repository URL + relative path in the repository)
+${REV}    ## REVision number
+${WCPATH} ## Working Copy PATH
+${URL}    ## URL of working path mirrored (repository URL + relative path)
 ## Repository URL depends on your role
-##- user:        http://forge.ipsl.jussieu.fr/nemo/svn
-##- developer svn+ssh://${ID}@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn
-
-${WCPATH} # Working Copy PATH
+## - user      => http://forge.ipsl.jussieu.fr/nemo/svn
+## - developer => svn+ssh://${ID}@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn
+}}}
 }}}
 
@@ -22 +21 @@
 }}}
 {{{#!th
-== Properties
-}}}
-{{{#!th
-== Branching / Merging
+== Advanced features
 }}}
 |-
 {{{#!td
-Download a working copy
+== Working copy
    {{{#!sh
-   $ svn {checkout,co} [${WCPATH}]
+   ## Download a working copy
+   svn {checkout,co} ${URL}[@${REV}]
+
+   ## Update it
+   svn {up,update} [-r ${REV}] [${WCPATH}]
+
+   ## Push modifications
+   svn {ci,commit} [-m 'one-liner message'] [${WCPATH}]
+   svn {ci,commit} --include-externals ...                ## Append externals
    }}}
-!Add/Remove item (file or folder)
+== Items
    {{{#!sh
-   $ svn {add,del,rm} ${WCPATH}
-   }}}
-Informations on working copy
-   {{{#!sh
-   $ svn info [{${WCPATH},${URL}}][@${REV}]
-   }}}
-Local status wrt the repository
-   {{{#!sh
-   $ svn status [-[qu]] [${WCPATH}]
-   }}}
-Local changes
-   {{{#!sh
-   $ svn {diff,revert} ${WCPATH}
-   }}}
-Push modififcations to repository
-   {{{#!sh
-   $ svn {ci,commit} [-m 'one-liner message'] [${WCPATH}]
-   }}}
- For modified externals, add `--include-externals` option
-List commit messages
-   {{{#!sh
-   $ svn log [{${URL},${WCPATH}}[@${REV}]]
+   ## Common cmds
+   svn add                 ${WCPATH}    ## Add item under versioning
+   svn {delete,remove,rm}  ${WCPATH}    ## Remove item
+   svn {st,status}        [${WCPATH}]   ## List modified items 
+   svn diff               [${WCPATH}]   ## Differences inside items
+   svn revert              ${WCPATH}    ## Give up edits
+
+   ## Straightforward UNIX-like cmds
+   svn {cat,list,ls} {${URL},${WCPATH}}[@${REV}]
+   svn mkdir         {${URL},${WCPATH}}
+
+   ## Infos
+   svn log  {${URL},${WCPATH}}[@${REV}]   ## List commit messages
+   svn info {${URL},${WCPATH}}[@${REV}]   ## Detailed  
+
+   ## In case of trouble
+   svn {resolve,resolved} ${WCPATH}   ## Ruling conflicted files
+   svn cleanup [${WCPATH}]            ## Fix corrupted working copy
    }}}
 }}}
 {{{#!td
-`svn:keywords Id`: record commit infos in routine
+== Properties
+http://svnbook.red-bean.com/en/1.7/svn.ref.properties.html
    {{{#!sh
-   $ svn propset svn:keywords Id on ${WCPATH}
+   ## {proplist,plist}
+   ## {propset,pset}
+   ## {propedit,pedit}
+   ## {propdel,pdel}
+
+   ## 'svn:keywords Id': record commit infos in routine
+   svn {propset,pset} svn:keywords Id on ${WCPATH}
+
+   ## 'svn:executable': set permissions for running scripts
+   svn {propset,pset} svn:executable on ${WCPATH}
+
+   ## 'svn:externals': defining external sources
+   ## - Single external
+   svn {propset,pset}  svn:externals ${URL}[@${REV}] ${WCPATH}
+   ## - Multi externals
+   svn {propset,pedit} svn:externals ${WCPATH}
    }}}
-`svn:mime-type`: syntax highlighting and merging process
+==  Branching
    {{{#!sh
-   $ svn propset svn:mime-type ... ${WCPATH}
-   }}}
-`svn:executable`: set permissions for scripts
-   {{{#!sh
-   $ svn propset svn:executable on ${WCPATH}
-   }}}
-`svn:externals`: defining external sources
-- Single external
-   {{{#!sh
-   $ svn propset svn:externals ${URL}[@${REV}] ${WCPATH}
-   }}}
-- Multi externals
-   {{{#!sh
-   $ svn propedit svn:externals ${WCPATH}
+   ## Create a branch (copying)
+   svn copy {${URL},${WCPATH}}[@${REV}] {${URL},${WCPATH}}
+
+   ## Merging sources
+   svn merge {${URL1},${WCPATH1}}[@${REV1}] [{${URL1},${WCPATH2}}[@${REV2}]] [${WCPATH}]
+
+   ## Update WC to a new URL
+   ## - Mirror a different branch $i.e$ traversing branch in the same repository (__hazardous!! __)
+   svn switch ${URL}[@${REV}] [${WCPATH}]
+   ## - Relocate to a different URL $i.e$ keep the same branch but move to a new server or URL scheme
+   svn switch --relocate ${URL1} ${URL2}
+   svn relocate          ${URL1} ${URL2}
    }}}
 }}}
-{{{#!td
-Create a branch (copying)
-   {{{#!sh
-   $ svn copy {${URL},${WCPATH}}[@${REV}] {${URL},${WCPATH}}
-   }}}
-Update WC to a new URL
-- Mirror a different branch $i.e$ traversing branch in the same repository (__hazardous!! __)
-   {{{#!sh
-   $ svn switch ${URL}[@${REV}] [${WCPATH}]
-   }}}
-- Relocate to a different URL $i.e$ keep the same branch but move to a new server or URL scheme
-   {{{#!sh
-   $ svn switch --relocate ${URL1} ${URL2}
-   }}}
-Merging sources
-   {{{#!sh
-   $ svn merge {${URL1},${WCPATH1}}[@${REV1}] [{${URL1},${WCPATH2}}[@${REV2}]] [${WCPATH}]
-   }}}
-Remove a branch
-   {{{#!sh
-   $ svn rm {${URL},${WCPATH}}
-   }}}
-}}}