Package | Description |
---|---|
org.tmatesoft.svn.core.internal.wc17 |
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) |
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) |
Copyright © 2024. All rights reserved.