Uses of Class
org.tmatesoft.svn.core.internal.wc17.SVNWCContext.MergeInfo
-
Packages that use SVNWCContext.MergeInfo Package Description org.tmatesoft.svn.core.internal.wc17 -
-
Uses of SVNWCContext.MergeInfo in org.tmatesoft.svn.core.internal.wc17
Methods in org.tmatesoft.svn.core.internal.wc17 that return SVNWCContext.MergeInfo Modifier and Type Method Description private SVNWCContext.MergeInfo
SVNWCContext. attemptTrivialMerge(SVNWCContext.MergeInfo info, java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.io.File detranslatedTargetAbspath, boolean dryRun)
private SVNWCContext.MergeInfo
SVNWCContext. evalConflictResolverResult(SVNConflictChoice choice, java.io.File wriAbspath, java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.io.File copyfromText, java.io.File mergedFile, java.io.File detranslatedTarget, SVNDiffOptions options)
private SVNWCContext.MergeInfo
SVNWCContext. maybeResolveConflicts(java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.io.File copyfromText, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, java.io.File resultTarget, java.io.File detranslatedTarget, SVNPropertyValue mimeprop, SVNDiffOptions options, ISVNConflictHandler conflictResolver)
SVNWCContext.MergeInfo
SVNWCContext. merge(SVNSkel workItems, SVNSkel conflictSkel, java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.io.File wriAbspath, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, SVNProperties oldActualProps, boolean dryRun, SVNDiffOptions options, SVNProperties propDiff)
private SVNWCContext.MergeInfo
SVNWCContext. mergeBinaryFile(SVNWCContext.MergeInfo info, java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, java.io.File detranslatedTargetAbspath, boolean dryRun)
SVNWCContext.MergeInfo
SVNWCContext. mergeText(java.io.File left, java.io.File right, java.io.File target, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean dryRun, SVNDiffOptions options, SVNProperties propDiff)
private SVNWCContext.MergeInfo
SVNWCContext. mergeTextFile(SVNWCContext.MergeInfo info, ISvnMerger customMerger, java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.io.File wriAbspath, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, boolean dryRun, SVNDiffOptions options, java.io.File copyfromText, java.io.File detranslatedTargetAbspath, SVNPropertyValue mimeprop)
static SVNWCContext.MergeInfo
SVNUpdateEditor17. performFileMerge(SVNWCContext.MergeInfo mergeInfo, SVNWCContext context, java.io.File localAbsPath, java.io.File wriAbsPath, SvnChecksum newChecksum, SvnChecksum originalChecksum, SVNProperties actualProperties, java.lang.String[] extPatterns, long oldRevision, long targetRevision, SVNProperties propChanges)
Methods in org.tmatesoft.svn.core.internal.wc17 with parameters of type SVNWCContext.MergeInfo Modifier and Type Method Description private SVNWCContext.MergeInfo
SVNWCContext. attemptTrivialMerge(SVNWCContext.MergeInfo info, java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.io.File detranslatedTargetAbspath, boolean dryRun)
private SVNWCContext.MergeInfo
SVNWCContext. mergeBinaryFile(SVNWCContext.MergeInfo info, java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, java.io.File detranslatedTargetAbspath, boolean dryRun)
private SVNWCContext.MergeInfo
SVNWCContext. mergeTextFile(SVNWCContext.MergeInfo info, ISvnMerger customMerger, java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, java.io.File wriAbspath, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, boolean dryRun, SVNDiffOptions options, java.io.File copyfromText, java.io.File detranslatedTargetAbspath, SVNPropertyValue mimeprop)
static SVNWCContext.MergeInfo
SVNUpdateEditor17. performFileMerge(SVNWCContext.MergeInfo mergeInfo, SVNWCContext context, java.io.File localAbsPath, java.io.File wriAbsPath, SvnChecksum newChecksum, SvnChecksum originalChecksum, SVNProperties actualProperties, java.lang.String[] extPatterns, long oldRevision, long targetRevision, SVNProperties propChanges)
-