SVNWCContext.MergePropertiesInfo |
SVNWCContext.mergeProperties(File localAbsPath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
SVNProperties baseProperties,
SVNProperties propChanges,
boolean dryRun,
ISVNConflictHandler conflictResolver) |
SVNWCContext.MergePropertiesInfo |
SVNWCContext.mergeProperties2(SVNWCContext.MergePropertiesInfo mergeInfo,
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,
File localAbsPath,
SVNProperties serverBaseProps,
SVNProperties pristineProps,
SVNProperties actualProps,
SVNProperties propChanges) |