Changes between Version 3 and Version 4 of Documentation/UserGuide/svnmerge


Ignore:
Timestamp:
2020-02-28T14:26:21+01:00 (4 years ago)
Author:
jgipsl
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Documentation/UserGuide/svnmerge

    v3 v4  
    11= How to compare 2 versions of ORCHIDEE = 
     2== Metode grafique == 
     3 
     4 * It is not easy to compare a local version from one branch (were local changes are not commited) with another branch.  
     5 * You can easily compare  
     6  * a local version(with changes that were not commited) with the same version on the SVN repository (the same branch). Use commands svn stat, svn -u stat, svn diff, etc. See also [https://forge.ipsl.jussieu.fr/orchidee/attachment/wiki/HowTo/svn10min_Ghattas_20140612.pdf 10 minutes SVN and ORCHIDEE] 
     7  * 2 versions of ORCHIDEE on the SVN using the web interface. For example to compare branch DOFOCO with the trunk. Access the web-interface by using the bottom '''Browse source''' up to the right on this page. See also the end of document above.  
     8 
     9== Metode en ligne == 
     10svn diff svn://forge.ipsl.jussieu.fr/orchidee/trunk/ORCHIDEE svn://forge.ipsl.jussieu.fr/orchidee/branches/ORCHIDEE-CN-CAN/ORCHIDEE 
     11 
    212 
    313== Matt wrote: == 
    … …  
    1424 
    1525The most important thing you need to know here is if you can actually access the version you are trying to merge with.  If you go onto the Wiki under the Browse Source label (http://forge.ipsl.jussieu.fr/orchidee/browser), if you can see a version there when you are logged in, you should be able to access it.  Be sure to find the location of the ORCHIDEE directory in the branch/personal folder that you are looking at.  In the example above, Josefine might have several version of ORCHIDEE laying around, and therefore we needed to dive a little deeper to actually find the location of the ORCHIDEE folder. 
    16  
    17 == Josefine wrote: == 
    18  * It is not easy to compare a local version from one branch (were local changes are not commited) with another branch.  
    19  * You can easily compare  
    20   * a local version(with changes that were not commited) with the same version on the SVN repository (the same branch). Use commands svn stat, svn -u stat, svn diff, etc. See also [https://forge.ipsl.jussieu.fr/orchidee/attachment/wiki/HowTo/svn10min_Ghattas_20140612.pdf 10 minutes SVN and ORCHIDEE] 
    21   * 2 versions of ORCHIDEE on the SVN using the web interface. For example to compare branch DOFOCO with the trunk. Access the web-interface by using the bottom '''Browse source''' up to the right on this page. See also the end of document above.