Package | Description |
---|---|
org.tmatesoft.svn.core.internal.wc17 | |
org.tmatesoft.svn.core.internal.wc2.ng |
Modifier and Type | Method and Description |
---|---|
SVNWCContext.MergePropertiesInfo |
SVNWCContext.mergeProperties(java.io.File localAbsPath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
SVNProperties baseProperties,
SVNProperties propChanges,
boolean dryRun,
ISVNConflictHandler conflictResolver) |
SVNWCContext.MergePropertiesInfo |
SVNWCContext.mergeProperties2(SVNWCContext.MergePropertiesInfo mergeInfo,
java.io.File localAbsPath,
ISVNWCDb.SVNWCDbKind kind,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
SVNProperties serverBaseProperties,
SVNProperties pristineProperties,
SVNProperties actualProperties,
SVNProperties propChanges,
boolean baseMerge,
boolean dryRun,
ISVNConflictHandler conflictResolver) |
SVNWCContext.MergePropertiesInfo |
SVNWCContext.mergeProperties3(SVNWCContext.MergePropertiesInfo mergePropertiesInfo,
java.io.File localAbsPath,
SVNProperties serverBaseProps,
SVNProperties pristineProps,
SVNProperties actualProps,
SVNProperties propChanges) |
Modifier and Type | Method and Description |
---|---|
SVNWCContext.MergePropertiesInfo |
SVNWCContext.mergeProperties2(SVNWCContext.MergePropertiesInfo mergeInfo,
java.io.File localAbsPath,
ISVNWCDb.SVNWCDbKind kind,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
SVNProperties serverBaseProperties,
SVNProperties pristineProperties,
SVNProperties actualProperties,
SVNProperties propChanges,
boolean baseMerge,
boolean dryRun,
ISVNConflictHandler conflictResolver) |
SVNWCContext.MergePropertiesInfo |
SVNWCContext.mergeProperties3(SVNWCContext.MergePropertiesInfo mergePropertiesInfo,
java.io.File localAbsPath,
SVNProperties serverBaseProps,
SVNProperties pristineProps,
SVNProperties actualProps,
SVNProperties propChanges) |
Modifier and Type | Method and Description |
---|---|
private SVNWCContext.MergePropertiesInfo |
SvnNgMergeCallback.mergePropChanges(java.io.File localAbsPath,
SVNProperties propChanges,
SVNProperties originalProperties) |