Changes between Version 18 and Version 19 of Documentation/UserGuide/CommitOnTrunk


Ignore:
Timestamp:
2020-12-01T18:10:36+01:00 (3 years ago)
Author:
aducharne
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Documentation/UserGuide/CommitOnTrunk

    v18 v19  
    22= Guidelines and help to commit on the trunk (or a branch) = 
    33Author: J. Ghattas[[BR]] 
    4 Last revision: 2020/02/28, B. Guenet 
     4Last revision: 2020/12/01, A. Ducharne 
    55 
    66Here are some general guidelines for committing into the trunk ORCHIDEE. These recommendations can also be applied to branches and other versions under SVN control.  
    … …  
    4949}}} 
    5050 
     51Example if you forgot to create ORCHIDEE_OL in your branch. First, under svn, copy ORCHIDEE_OL from a close version of your branch, then extract it to your working directory (where you develop your version). There copy/modify your configuration files, add them to svn and eventually commit:  
     52 
     53{{{ 
     54svn cp svn://forge.ipsl.jussieu.fr/orchidee/branches/ORCHIDEE_2_2/ORCHIDEE_OL svn://forge.ipsl.jussieu.fr/orchidee/branches/ORCHIDEE-SP-MIP/ORCHIDEE_OL 
     55cd $workdir/ORCHIDEE-SP-MIP/ 
     56svn co svn://forge.ipsl.jussieu.fr/orchidee/branches/ORCHIDEE-SP-MIP/ORCHIDEE_OL ORCHIDEE_OL  
     57cp -r $newconfig/OOL_SEC_STO_SPMIP ORCHIDEE_OL/OOL_SEC_STO_SPMIP 
     58svn add ORCHIDEE_OL/OOL_SEC_STO_SPMIP 
     59svn -u stat 
     60svn ci 
     61}}} 
    5162 
    5263=== Activate revision information ===