Examples of org.exist.versioning.svn.wc.ISVNMerger.mergeText()

Class org.exist.versioning.svn.wc.ISVNMerger

Examples of org.exist.versioning.svn.wc.ISVNMerger.mergeText()

org.exist.versioning.svn.wc.ISVNMerger.mergeText()
Performs a text merge. @param files files invoked in merge @param dryRun if true, merge is simulated only, no realchanges are done @param options merge options to take into account @return result of merging @throws SVNException

                String localLabel = ".working";
                String baseLabel = ".old";
                String latestLabel = ".new";
                
                mergeFileSet.setMergeLabels(baseLabel, localLabel, latestLabel);
                merger.mergeText(mergeFileSet, false, null);
                mergeFileSet.dispose();
                removeSource = true;
            }
        } else if (conflictChoice != SVNConflictChoice.MERGED) {
            SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.INCORRECT_PARAMS, "Invalid 'conflict_result' argument");

View Full Code Here


        mergeFileSet.setMergeLabels(baseLabel, localLabel, latestLabel);


      SVNMergeResult mergeResult;
      try {
          mergeResult = merger.mergeText(mergeFileSet, dryRun, options);
      }
      finally {
        if (dryRun) {
            SVNFileUtil.deleteFile(resultFile);
        }

View Full Code Here

TOP

All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.