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


Ignore:
Timestamp:
02/28/20 15:44:46 (2 years ago)
Author:
mmcgrath
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Documentation/UserGuide/svnmerge

    v4 v5  
    1 = How to compare 2 versions of ORCHIDEE = 
    2 == Metode grafique == 
     1= How to compare two versions of ORCHIDEE = 
    32 
    4  * It is not easy to compare a local version from one branch (were local changes are not commited) with another branch.  
     3Author: M. !McGrath and J. Ghattas 
     4 
     5Last revision: 2020/02/28, M. !McGrath  
     6 
     7If you would like to integrate the differences between one version of ORCHIDEE (such as the trunk, or a branch, or someone's personal copy) and your local copy, please see [https://forge.ipsl.jussieu.fr/orchidee/wiki/Documentation/UserGuide/svnKeepUpdated this page.]  If you simply want to see the differences, the text below shows you two different ways to do it. 
     8 
     9There are times when you want to know what has changed between a version you are working on and a version someone else has in SVN.  For example, someone told you about a cool feature in the OCN branch and you want to see how difficult it would be to put it into your personal copy.  Such an action requires first to see how many differences there are between the version you are working on and the version of interest. 
     10 
     11The 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), you can see all the versions you have access to.  If you can't see a version, you don't have access.  Be sure to find the location of the ORCHIDEE directory in the branch/personal folder that you are looking at.   
     12 
     13Note 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. 
     14 
     15== Graphical method == 
     16 
    517 * You can easily compare  
    618  * 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] 
     
    820 
    921== Metode en ligne == 
    10 svn diff svn://forge.ipsl.jussieu.fr/orchidee/trunk/ORCHIDEE svn://forge.ipsl.jussieu.fr/orchidee/branches/ORCHIDEE-CN-CAN/ORCHIDEE 
     22 
    1123 
    1224 
    1325== Matt wrote: == 
    14 There are times when you want to know what has changed between a version you are working on and a version someone else has in SVN.  For example, someone told you about a cool feature in the OCN branch and you want to see how difficult it would be to put it into your personal copy.  Such an action requires first to see how many differences there are between the version you are working on and the version of interest. 
    1526 
    16 svn merge is a good way to do this.  Let's say that I have my local copy of ORCHIDEE installed in modipsl/modeles/ORCHIDEE.  Josefine has told me that she has a cool feature in her personal version that I might be interested in, so I'd like to know how many files are in conflict. 
     27If 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]. 
    1728 
    1829{{{ 
    19 cd modipsl/modeles/ 
    20 svn merge --dry-run svn://forge.ipsl.jussieu.fr/orchidee/perso/josefine.ghattas/.../ORCHIDEE ORCHIDEE 
     30   svn diff svn://forge.ipsl.jussieu.fr/orchidee/trunk/ORCHIDEE svn://forge.ipsl.jussieu.fr/orchidee/branches/ORCHIDEE-CN-CAN/ORCHIDEE 
    2131}}} 
     32to compare the trunk against the branch CN-CAN.  Or 
     33{{{ 
     34   svn diff svn://forge.ipsl.jussieu.fr/orchidee/trunk/ORCHIDEE MYDIRECTORY/modeles/ORCHIDEE 
     35}}} 
     36to see differences between the trunk and a version of ORCHIDEE that you have extracted locally into MYDIRECTORY. 
    2237 
    23 the "dry-run" option means that it will tell you what files are in conflict without actually doing the merge and changing your local version of the code. 
    2438 
    25 The 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. 
     39