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.
|
Modifier and Type | Field and 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 |
Modifier and Type | Method and Description |
---|---|
SVNDiffConflictChoiceStyle |
DefaultSVNMerger.getDiffConflictStyle() |
Modifier and Type | Method and 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) |
Constructor and Description |
---|
DefaultSVNMerger(byte[] start,
byte[] sep,
byte[] end,
ISVNConflictHandler callback,
SVNDiffConflictChoiceStyle style) |
Modifier and Type | Method and 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) |
Modifier and Type | Method and 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.
|