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 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)
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)
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 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)
-