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