Changes between Version 5 and Version 6 of Documentation/UserGuide/svnmerge


Ignore:
Timestamp:
2020-02-28T16:20:03+01:00 (4 years ago)
Author:
mmcgrath
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Documentation/UserGuide/svnmerge

    v5 v6  
    1313Note that you cannot see differences between versions that have not been committed to svn.  So, if someone makes modifications to the trunk but never does "svn commit", you cannot see those differences with these methods. 
    1414 
    15 == Graphical method == 
    16  
    17  * You can easily compare  
    18   * 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] 
    19   * 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.  
    20  
    21 == Metode en ligne == 
     15You can easily compare a local version (with changes that were not commited) with the same branch on the SVN repository. Use the commands "svn stat", "svn -u stat", "svn diff", etc. More detail is found in this .pdf of [https://forge.ipsl.jussieu.fr/orchidee/attachment/wiki/HowTo/svn10min_Ghattas_20140612.pdf SVN and ORCHIDEE in 10 minutes].  The commands below are to compare the either two versions (branches) svn to each other, or to compare the modifications that you have made in your local directory to a different branch. 
    2216 
    2317 
     18== Graphical method using the web interface == 
    2419 
    25 == Matt wrote: == 
     20The source code of all versions of ORCHIDEE that you have access to can be seen [https://forge.ipsl.jussieu.fr/orchidee/browser?order=name here].  '''Make sure you are logged in.''' The "View changes" buttom a the bottom will allow you to select two different branches and different revisions. 
     21 
     22This only works for changes that have been committed to SVN. 
     23 
     24== Command line method == 
    2625 
    2726If you prefer the command line, you can use "svn diff".  You will need to find the svn address of the version of ORCHIDEE that you are trying to compare against ([https://forge.ipsl.jussieu.fr/orchidee/wiki/Documentation/UserGuide/svnKeepUpdated this page has something short about that].