How to use

org.tmatesoft.svn.core.internal.wc.FSMergerBySequence

constructor

public SVNStatusType mergeText(File baseFile, File localFile, File latestFile, boolean dryRun, SVNDiffOptions options, OutputStream result) throws SVNException {
  FSMergerBySequence merger = new FSMergerBySequence(myStart, mySeparator, myEnd);
  int mergeResult = 0;
  RandomAccessFile localIS = null;

private void showConflictedChunks(SVNMergeFileSet files) throws SVNException {
  byte[] conflictStartMarker = "<<<<<<< MINE (select with 'mc')".getBytes();
  byte[] conflictSeparator = "=======".getBytes();
  byte[] conflictEndMarker = ">>>>>>> THEIRS (select with 'tc')".getBytes();
  byte[] conflictOriginalMarker = "||||||| ORIGINAL".getBytes();
  SVNDiffOptions options = new SVNDiffOptions(false, false, true);
  FSMergerBySequence merger = new FSMergerBySequence(conflictStartMarker, conflictSeparator, conflictEndMarker, conflictOriginalMarker);
  RandomAccessFile localIS = null;
  RandomAccessFile latestIS = null;
  RandomAccessFile baseIS = null;
  try {
    localIS = new RandomAccessFile(files.getWCFile(), "r");
    latestIS = new RandomAccessFile(files.getRepositoryFile(), "r");
    baseIS = new RandomAccessFile(files.getBaseFile(), "r");
    QSequenceLineRAData baseData = new QSequenceLineRAFileData(baseIS);
    QSequenceLineRAData localData = new QSequenceLineRAFileData(localIS);
    QSequenceLineRAData latestData = new QSequenceLineRAFileData(latestIS);
    merger.merge(baseData, localData, latestData, options, mySVNEnvironment.getOut(), SVNDiffConflictChoiceStyle.CHOOSE_ONLY_CONFLICTS);
  } catch (IOException e) {
    SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, e.getLocalizedMessage());
    SVNErrorManager.error(err, e, SVNLogType.WC);
  } finally {
    SVNFileUtil.closeFile(localIS);
    SVNFileUtil.closeFile(baseIS);
    SVNFileUtil.closeFile(latestIS);
  }
}

private void showConflictedChunks(SVNMergeFileSet files) throws SVNException {
  byte[] conflictStartMarker = "<<<<<<< MINE (select with 'mc')".getBytes();
  byte[] conflictSeparator = "=======".getBytes();
  byte[] conflictEndMarker = ">>>>>>> THEIRS (select with 'tc')".getBytes();
  byte[] conflictOriginalMarker = "||||||| ORIGINAL".getBytes();
  SVNDiffOptions options = new SVNDiffOptions(false, false, true);
  FSMergerBySequence merger = new FSMergerBySequence(conflictStartMarker, conflictSeparator, conflictEndMarker, conflictOriginalMarker);
  RandomAccessFile localIS = null;
  RandomAccessFile latestIS = null;
  RandomAccessFile baseIS = null;
  try {
    localIS = new RandomAccessFile(files.getWCFile(), "r");
    latestIS = new RandomAccessFile(files.getRepositoryFile(), "r");
    baseIS = new RandomAccessFile(files.getBaseFile(), "r");
    QSequenceLineRAData baseData = new QSequenceLineRAFileData(baseIS);
    QSequenceLineRAData localData = new QSequenceLineRAFileData(localIS);
    QSequenceLineRAData latestData = new QSequenceLineRAFileData(latestIS);
    merger.merge(baseData, localData, latestData, options, mySVNEnvironment.getOut(), SVNDiffConflictChoiceStyle.CHOOSE_ONLY_CONFLICTS);
  } catch (IOException e) {
    SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.IO_ERROR, e.getLocalizedMessage());
    SVNErrorManager.error(err, e, SVNLogType.WC);
  } finally {
    SVNFileUtil.closeFile(localIS);
    SVNFileUtil.closeFile(baseIS);
    SVNFileUtil.closeFile(latestIS);
  }
}

String leftMarker = markersInfo.leftMarker;
String rightMarker = markersInfo.rightMarker;
FSMergerBySequence merger = new FSMergerBySequence(targetMarker.getBytes(), SVNWCContext.CONFLICT_SEPARATOR, rightMarker.getBytes(), leftMarker.getBytes());
int mergeResult = 0;
RandomAccessFile localIS = null;

protected SVNStatusType mergeText(File baseFile, File localFile, File latestFile, SVNDiffOptions options, File resultFile) throws SVNException {
  FSMergerBySequence merger = new FSMergerBySequence(getConflictStartMarker(), getConflictSeparatorMarker(), getConflictEndMarker());
  int mergeResult = 0;
  RandomAccessFile localIS = null;

protected SVNStatusType mergeText(File baseFile, File localFile, File latestFile, SVNDiffOptions options, File resultFile) throws SVNException {
  FSMergerBySequence merger = new FSMergerBySequence(getConflictStartMarker(), getConflictSeparatorMarker(), getConflictEndMarker());
  int mergeResult = 0;
  RandomAccessFile localIS = null;

protected SVNStatusType mergeText(File baseFile, File localFile, File latestFile, SVNDiffOptions options, File resultFile) throws SVNException {
  FSMergerBySequence merger = new FSMergerBySequence(getConflictStartMarker(), getConflictSeparatorMarker(), getConflictEndMarker());
  int mergeResult = 0;
  RandomAccessFile localIS = null;

SVNDiffConflictChoiceStyle style = choice == SVNConflictChoice.THEIRS_CONFLICT ? SVNDiffConflictChoiceStyle.CHOOSE_LATEST : SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED;
File tempDir = db.getWCRootTempDir(wriAbspath);
FSMergerBySequence merger = new FSMergerBySequence(null, null, null);
RandomAccessFile localIS = null;
RandomAccessFile latestIS = null;

FSMergerBySequence merger = new FSMergerBySequence(getConflictStartMarker(),
    getConflictSeparatorMarker(), getConflictEndMarker());
OutputStream result = null;

FSMergerBySequence merger = new FSMergerBySequence(getConflictStartMarker(),
    getConflictSeparatorMarker(), getConflictEndMarker());
OutputStream result = null;

String leftMarker = markersInfo.leftMarker;
String rightMarker = markersInfo.rightMarker;
FSMergerBySequence merger = new FSMergerBySequence(
    targetMarker.getBytes(),
    CONFLICT_SEPARATOR,

FSMergerBySequence merger = new FSMergerBySequence(getConflictStartMarker(),
    getConflictSeparatorMarker(), getConflictEndMarker());
OutputStream result = null;

File uniqueFile = SVNFileUtil.createUniqueFile(tempDir, null, null, false);
FSMergerBySequence merger = new FSMergerBySequence(null, null, null);

FSMergerBySequence merger = new FSMergerBySequence(nullBytes, nullBytes, nullBytes);
RandomAccessFile localIS = null;
RandomAccessFile latestIS = null;

SVNDiffOptions svnDiffOptions = new SVNDiffOptions();
FSMergerBySequence merger = new FSMergerBySequence(CONFLICT_START, CONFLICT_SEPARATOR, CONFLICT_END);
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
try {

FSMergerBySequence merger = new FSMergerBySequence(CONFLICT_START, CONFLICT_SEPARATOR, CONFLICT_END);
OutputStream result = null;
try {