Uses of Class
org.tmatesoft.svn.core.internal.wc.SVNDiffConflictChoiceStyle

Packages that use SVNDiffConflictChoiceStyle

Package	Description
org.tmatesoft.svn.core.internal.wc
org.tmatesoft.svn.core.internal.wc17
org.tmatesoft.svn.core.wc2	NEW: this package contains command-style API to perform most of Subversion operations on the level of abstraction similar to that of the command line client.

Uses of SVNDiffConflictChoiceStyle in org.tmatesoft.svn.core.internal.wc

Fields in org.tmatesoft.svn.core.internal.wc declared as SVNDiffConflictChoiceStyle

Modifier and Type	Field	Description
static SVNDiffConflictChoiceStyle	SVNDiffConflictChoiceStyle.CHOOSE_LATEST
static SVNDiffConflictChoiceStyle	SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED
static SVNDiffConflictChoiceStyle	SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED_LATEST
static SVNDiffConflictChoiceStyle	SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED_ORIGINAL_LATEST
static SVNDiffConflictChoiceStyle	SVNDiffConflictChoiceStyle.CHOOSE_ONLY_CONFLICTS
static SVNDiffConflictChoiceStyle	SVNDiffConflictChoiceStyle.CHOOSE_RESOLVED_MODIFIED_LATEST
private SVNDiffConflictChoiceStyle	DefaultSVNMerger.myDiffConflictStyle

Methods in org.tmatesoft.svn.core.internal.wc that return SVNDiffConflictChoiceStyle

Modifier and Type	Method	Description
SVNDiffConflictChoiceStyle	DefaultSVNMerger.getDiffConflictStyle()

Methods in org.tmatesoft.svn.core.internal.wc with parameters of type SVNDiffConflictChoiceStyle

Modifier and Type	Method	Description
private int	FSMergerBySequence.createConflict(java.io.OutputStream result, de.regnis.q.sequence.QSequenceDifferenceBlock localStart, de.regnis.q.sequence.QSequenceDifferenceBlock localEnd, de.regnis.q.sequence.QSequenceDifferenceBlock latestStart, de.regnis.q.sequence.QSequenceDifferenceBlock latestEnd, de.regnis.q.sequence.line.QSequenceLineCache localLines, de.regnis.q.sequence.line.QSequenceLineCache latestLines, int baseLineIndex, java.util.List transformedLocalLines, SVNDiffConflictChoiceStyle style)
int	FSMergerBySequence.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)
void	DefaultSVNMerger.setDiffConflictStyle(SVNDiffConflictChoiceStyle diffConflictStyle)

Constructors in org.tmatesoft.svn.core.internal.wc with parameters of type SVNDiffConflictChoiceStyle

Constructor	Description
DefaultSVNMerger(byte[] start, byte[] sep, byte[] end, ISVNConflictHandler callback, SVNDiffConflictChoiceStyle style)

Uses of SVNDiffConflictChoiceStyle in org.tmatesoft.svn.core.internal.wc17

Methods in org.tmatesoft.svn.core.internal.wc17 with parameters of type SVNDiffConflictChoiceStyle

Modifier and Type	Method	Description
private boolean	SVNWCContext.doTextMerge(ISvnMerger customMerger, java.io.File resultFile, java.io.File targetAbsPath, java.io.File detranslatedTargetAbspath, java.io.File leftAbspath, java.io.File rightAbspath, java.lang.String targetLabel, java.lang.String leftLabel, java.lang.String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style)
SvnMergeResult	DefaultSvnMerger.mergeText(ISvnMerger baseMerger, java.io.File resultFile, java.io.File targetAbspath, java.io.File detranslatedTargetAbspath, java.io.File leftAbspath, java.io.File rightAbspath, java.lang.String targetLabel, java.lang.String leftLabel, java.lang.String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style)

Uses of SVNDiffConflictChoiceStyle in org.tmatesoft.svn.core.wc2

Methods in org.tmatesoft.svn.core.wc2 with parameters of type SVNDiffConflictChoiceStyle

Modifier and Type	Method	Description
SvnMergeResult	ISvnMerger.mergeText(ISvnMerger baseMerger, java.io.File resultFile, java.io.File targetAbspath, java.io.File detranslatedTargetAbspath, java.io.File leftAbspath, java.io.File rightAbspath, java.lang.String targetLabel, java.lang.String leftLabel, java.lang.String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style)	Performs a text merge.