1 /*
   2  * ====================================================================
   3  * Copyright (c) 2004-2008 TMate Software Ltd.  All rights reserved.
   4  *
   5  * This software is licensed as described in the file COPYING, which
   6  * you should have received as part of this distribution.  The terms
   7  * are also available at http://svnkit.com/license.html.
   8  * If newer versions of this license are posted there, you may use a
   9  * newer version instead, at your option.
  10  * ====================================================================
  11  */
  12 package org.tmatesoft.svn.examples.wc;
  13 
  14 import java.io.File;
  15 import java.io.IOException;
  16 import java.util.Collections;
  17 
  18 import org.tmatesoft.svn.core.SVNCommitInfo;
  19 import org.tmatesoft.svn.core.SVNDepth;
  20 import org.tmatesoft.svn.core.SVNException;
  21 import org.tmatesoft.svn.core.SVNPropertyValue;
  22 import org.tmatesoft.svn.core.SVNURL;
  23 import org.tmatesoft.svn.core.wc.SVNClientManager;
  24 import org.tmatesoft.svn.core.wc.SVNCommitClient;
  25 import org.tmatesoft.svn.core.wc.SVNCopyClient;
  26 import org.tmatesoft.svn.core.wc.SVNCopySource;
  27 import org.tmatesoft.svn.core.wc.SVNDiffClient;
  28 import org.tmatesoft.svn.core.wc.SVNRevision;
  29 import org.tmatesoft.svn.core.wc.SVNRevisionRange;
  30 import org.tmatesoft.svn.core.wc.SVNWCClient;
  31 
  32 
  33 /**
  34  * @version 1.2.0
  35  * @author  TMate Software Ltd.
  36  */
  37 public class Merge {
  38 
  39     /**
  40      * Pass the absolute path of the base directory where all example data will be created in 
  41      * arg[0]. The sample will create:
  42      *  
  43      *  - arg[0]/exampleRepository - repository with some test data
  44      *  - arg[0]/exampleWC         - working copy checked out from exampleRepository
  45      */
  46     public static void main (String[] args) {
  47         //0. initialize SVNKit to work through file:/// protocol
  48         SamplesUtility.initializeFSFSprotocol();
  49         
  50         File baseDirectory = new File(args[0]);
  51         File reposRoot = new File(baseDirectory, "exampleRepository");
  52         File wcRoot = new File(baseDirectory, "exampleWC");
  53         
  54         try {
  55             //1. first create a repository
  56             SamplesUtility.createRepository(reposRoot);
  57             //2. fill it with data
  58             SVNCommitInfo info = SamplesUtility.createRepositoryTree(reposRoot);
  59             //print out new revision info
  60             System.out.println(info);
  61 
  62             SVNClientManager clientManager = SVNClientManager.newInstance();
  63             
  64             SVNURL reposURL = SVNURL.fromFile(reposRoot);
  65 
  66             //3. copy A to A_copy in the repository (url-to-url copy)
  67             SVNCopyClient copyClient = clientManager.getCopyClient();
  68             SVNURL A_URL = reposURL.appendPath("A", true);
  69             SVNURL copyTargetURL = reposURL.appendPath("A_copy", true);
  70             SVNCopySource copySource = new SVNCopySource(SVNRevision.UNDEFINED, SVNRevision.HEAD, A_URL); 
  71             info = copyClient.doCopy(new SVNCopySource[] { copySource }, copyTargetURL, false, false, true, 
  72                     "copy A to A_copy", null);
  73             //print out new revision info
  74             System.out.println(info);
  75             
  76             //4. checkout the entire repository tree
  77             SamplesUtility.checkOutWorkingCopy(reposURL, wcRoot);
  78 
  79             
  80             //5. now make some changes to the A tree and commit them
  81             SamplesUtility.writeToFile(new File(wcRoot, "iota"), "New text appended to 'iota'", true);
  82             SamplesUtility.writeToFile(new File(wcRoot, "A/mu"), "New text in 'mu'", false);
  83             
  84             SVNWCClient wcClient = SVNClientManager.newInstance().getWCClient();
  85             wcClient.doSetProperty(new File(wcRoot, "A/B"), "spam", SVNPropertyValue.create("egg"), false, 
  86                     SVNDepth.EMPTY, null, null);
  87 
  88             //commit local changes
  89             SVNCommitClient commitClient = clientManager.getCommitClient();
  90             commitClient.doCommit(new File[] { wcRoot }, false, "committing changes", null, null, false, false, SVNDepth.INFINITY);
  91             
  92             //6. now merge changes from trunk to the branch.
  93             SVNDiffClient diffClient = clientManager.getDiffClient();
  94             SVNRevisionRange rangeToMerge = new SVNRevisionRange(SVNRevision.create(1), SVNRevision.HEAD);
  95             
  96             diffClient.doMerge(A_URL, SVNRevision.HEAD, Collections.singleton(rangeToMerge), 
  97                     new File(wcRoot, "A_copy"), SVNDepth.INFINITY, true, false, false, false);
  98             
  99             
 100             //7. now make some changes to the A tree again and commit them
 101             //change file contents of iota and A/D/gamma
 102             SamplesUtility.writeToFile(new File(wcRoot, "iota"), "New text2 appended to 'iota'", true);
 103             SamplesUtility.writeToFile(new File(wcRoot, "A/D/gamma"), "New text in 'gamma'", false);
 104             //remove A/C from version control
 105             wcClient.doDelete(new File(wcRoot, "A/C"), false, true, false);
 106 
 107             //commit local changes
 108             commitClient.doCommit(new File[] { wcRoot }, false, "committing changes again", null, null, false, false, SVNDepth.INFINITY);
 109 
 110             /* 8. do the same merge call, merge-tracking feature will merge only those revisions
 111              * which were not merged yet.
 112              */ 
 113             diffClient.doMerge(A_URL, SVNRevision.HEAD, Collections.singleton(rangeToMerge), 
 114                     new File(wcRoot, "A_copy"), SVNDepth.INFINITY, true, false, false, false);
 115             
 116         } catch (SVNException svne) {
 117             System.out.println(svne.getErrorMessage());
 118             System.exit(1);
 119         } catch (IOException ioe) {
 120             ioe.printStackTrace();
 121             System.exit(1);
 122         }
 123     }
 124 }