Changes between Version 16 and Version 17 of Documentation/UserGuide/CommitOnTrunk


Ignore:
Timestamp:
03/03/20 13:52:07 (14 months ago)
Author:
jgipsl
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Documentation/UserGuide/CommitOnTrunk

    v16 v17  
    7474 
    7575 
     76=== Update a branch with changes done in the trunk === 
     77First make sure that all changes in the branch have been committed. No local changes should exist in the folder.  
     78In a terminal, go to the directory with the source code for the branch: 
     79{{{ 
     80cd modipsl/modeles/ORCHIDEE    # in the branch 
     81}}} 
     82 
     83Determine the revision interval x1:X2 with changes done on the trunk that you want to integrate in the branch 
     84Check first with --dry-run which files are affected: 
     85{{{ 
     86svn merge --dry-run -r x1:x2 svn://forge.ipsl.jussieu.fr/orchidee/trunk/ORCHIDEE 
     87}}} 
     88 
     89Then do the real merge: 
     90{{{ 
     91svn merge -r x1:x2 svn://forge.ipsl.jussieu.fr/orchidee/trunk/ORCHIDEE 
     92}}} 
     93If files gives conflicts, you can answer p for postpone and resolve them manually after finishing the command merge. The command svn merge will not commit any changes. All changes will be done locally and you need to validate by svn diff and svn ci to commit.  
     94 
     95 
     96 
     97=== Merge changes done on a branch into the trunk === 
     98The same command svn merge can be used to merge a branch into the trunk. For this case, install locally the trunk and go to that folder. The svn command will look something like folllwing: 
     99{{{ 
     100cd modipsl/modeles/ORCHIDEE    # in the trunk 
     101svn merge -r x1:x2 svn://forge.ipsl.jussieu.fr/orchidee/branches/ORCHIDEE-TOTO/ORCHIDEE 
     102}}}