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 and Description
SVNWCContext.MergeInfo	SVNWCContext.merge(SVNSkel workItems, SVNSkel conflictSkel, File leftAbspath, File rightAbspath, File targetAbspath, File wriAbspath, String leftLabel, String rightLabel, String targetLabel, SVNProperties oldActualProps, boolean dryRun, SVNDiffOptions options, SVNProperties propDiff)
SVNWCContext.MergeInfo	SVNWCContext.mergeText(File left, File right, File target, String leftLabel, String rightLabel, String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean dryRun, SVNDiffOptions options, SVNProperties propDiff)
static SVNWCContext.MergeInfo	SVNUpdateEditor17.performFileMerge(SVNWCContext.MergeInfo mergeInfo, SVNWCContext context, File localAbsPath, File wriAbsPath, SvnChecksum newChecksum, SvnChecksum originalChecksum, SVNProperties actualProperties, 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 and Description
static SVNWCContext.MergeInfo	SVNUpdateEditor17.performFileMerge(SVNWCContext.MergeInfo mergeInfo, SVNWCContext context, File localAbsPath, File wriAbsPath, SvnChecksum newChecksum, SvnChecksum originalChecksum, SVNProperties actualProperties, String[] extPatterns, long oldRevision, long targetRevision, SVNProperties propChanges)