Uses of Class
org.tmatesoft.svn.core.internal.wc.SVNDiffConflictChoiceStyle
Packages that use SVNDiffConflictChoiceStyle
Package
Description
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 SVNDiffConflictChoiceStyleModifier and TypeFieldDescriptionstatic final SVNDiffConflictChoiceStyle
SVNDiffConflictChoiceStyle.CHOOSE_LATEST
static final SVNDiffConflictChoiceStyle
SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED
static final SVNDiffConflictChoiceStyle
SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED_LATEST
static final SVNDiffConflictChoiceStyle
SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED_ORIGINAL_LATEST
static final SVNDiffConflictChoiceStyle
SVNDiffConflictChoiceStyle.CHOOSE_ONLY_CONFLICTS
static final SVNDiffConflictChoiceStyle
SVNDiffConflictChoiceStyle.CHOOSE_RESOLVED_MODIFIED_LATEST
private SVNDiffConflictChoiceStyle
DefaultSVNMerger.myDiffConflictStyle
Methods in org.tmatesoft.svn.core.internal.wc that return SVNDiffConflictChoiceStyleMethods in org.tmatesoft.svn.core.internal.wc with parameters of type SVNDiffConflictChoiceStyleModifier and TypeMethodDescriptionprivate int
FSMergerBySequence.createConflict
(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, 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, OutputStream result, SVNDiffConflictChoiceStyle style) void
DefaultSVNMerger.setDiffConflictStyle
(SVNDiffConflictChoiceStyle diffConflictStyle) Constructors in org.tmatesoft.svn.core.internal.wc with parameters of type SVNDiffConflictChoiceStyleModifierConstructorDescriptionDefaultSVNMerger
(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 SVNDiffConflictChoiceStyleModifier and TypeMethodDescriptionprivate boolean
SVNWCContext.doTextMerge
(ISvnMerger customMerger, File resultFile, File targetAbsPath, File detranslatedTargetAbspath, File leftAbspath, File rightAbspath, String targetLabel, String leftLabel, String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style) DefaultSvnMerger.mergeText
(ISvnMerger baseMerger, File resultFile, File targetAbspath, File detranslatedTargetAbspath, File leftAbspath, File rightAbspath, String targetLabel, String leftLabel, 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 SVNDiffConflictChoiceStyleModifier and TypeMethodDescriptionISvnMerger.mergeText
(ISvnMerger baseMerger, File resultFile, File targetAbspath, File detranslatedTargetAbspath, File leftAbspath, File rightAbspath, String targetLabel, String leftLabel, String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style) Performs a text merge.