org.tmatesoft.svn.core.internal.wc

Class FSMergerBySequence

java.lang.Object

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

public class FSMergerBySequence
extends java.lang.Object

Version:

1.3

Author:

TMate Software Ltd.

Field Summary

Fields

Modifier and Type	Field and Description
static int	CONFLICTED
static java.lang.String	DEFAULT_EOL
static int	MERGED
static int	NOT_MODIFIED

Constructor Summary

Constructors

Constructor and Description
FSMergerBySequence(byte[] conflictStart, byte[] conflictSeparator, byte[] conflictEnd)
FSMergerBySequence(byte[] conflictStart, byte[] conflictSeparator, byte[] conflictEnd, byte[] originalMarker)

Method Summary

Modifier and Type	Method and Description
int	merge(de.regnis.q.sequence.line.QSequenceLineRAData baseData, de.regnis.q.sequence.line.QSequenceLineRAData localData, de.regnis.q.sequence.line.QSequenceLineRAData latestData, SVNDiffOptions options, java.io.OutputStream result, SVNDiffConflictChoiceStyle style)

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Detail

DEFAULT_EOL

public static final java.lang.String DEFAULT_EOL

NOT_MODIFIED

public static final int NOT_MODIFIED

See Also:

Constant Field Values

MERGED

public static final int MERGED

See Also:

Constant Field Values

CONFLICTED

public static final int CONFLICTED

See Also:

Constant Field Values

Constructor Detail

FSMergerBySequence

public FSMergerBySequence(byte[] conflictStart,
                          byte[] conflictSeparator,
                          byte[] conflictEnd)

FSMergerBySequence

public FSMergerBySequence(byte[] conflictStart,
                          byte[] conflictSeparator,
                          byte[] conflictEnd,
                          byte[] originalMarker)

Method Detail

merge

public int merge(de.regnis.q.sequence.line.QSequenceLineRAData baseData,
                 de.regnis.q.sequence.line.QSequenceLineRAData localData,
                 de.regnis.q.sequence.line.QSequenceLineRAData latestData,
                 SVNDiffOptions options,
                 java.io.OutputStream result,
                 SVNDiffConflictChoiceStyle style)
          throws java.io.IOException

Throws:

java.io.IOException