Uses of Class
org.tmatesoft.svn.core.internal.wc17.SVNWCContext.MergePropertiesInfo

Packages that use SVNWCContext.MergePropertiesInfo

Package	Description
org.tmatesoft.svn.core.internal.wc17
org.tmatesoft.svn.core.internal.wc2.ng

Uses of SVNWCContext.MergePropertiesInfo in org.tmatesoft.svn.core.internal.wc17

Methods in org.tmatesoft.svn.core.internal.wc17 that return SVNWCContext.MergePropertiesInfo

Modifier and Type	Method	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)

Methods in org.tmatesoft.svn.core.internal.wc17 with parameters of type SVNWCContext.MergePropertiesInfo

Modifier and Type	Method	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)

Uses of SVNWCContext.MergePropertiesInfo in org.tmatesoft.svn.core.internal.wc2.ng

Methods in org.tmatesoft.svn.core.internal.wc2.ng that return SVNWCContext.MergePropertiesInfo

Modifier and Type	Method	Description
private SVNWCContext.MergePropertiesInfo	SvnNgMergeCallback.mergePropChanges(java.io.File localAbsPath, SVNProperties propChanges, SVNProperties originalProperties)