Uses of Class
org.tmatesoft.svn.core.internal.wc17.SvnSingleRangeConflictReport
-
Packages that use SvnSingleRangeConflictReport Package Description org.tmatesoft.svn.core.internal.wc2.ng -
-
Uses of SvnSingleRangeConflictReport in org.tmatesoft.svn.core.internal.wc2.ng
Methods in org.tmatesoft.svn.core.internal.wc2.ng that return SvnSingleRangeConflictReport Modifier and Type Method Description protected SvnSingleRangeConflictReport
SvnNgMergeDriver. doDirectoryMerge(java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> resultCatalog, SvnNgMergeDriver.MergeSource source, java.io.File targetAbsPath, SVNURL sourceRootUrl, ISvnDiffCallback2 processor, SVNDepth depth, boolean squelchMergeinfoNotifications)
private SvnSingleRangeConflictReport
SvnNgMergeDriver. doFileMerge(java.io.File targetAbsPath, java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> resultCatalog, SvnNgMergeDriver.MergeSource source, ISvnDiffCallback2 mergeProcessor, boolean sourcesRelated, boolean squelcheMergeInfoNotifications)
protected SvnSingleRangeConflictReport
SvnNgMergeDriver. doMergeInfoAwareDirectoryMerge(java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> resultCatalog, SvnNgMergeDriver.MergeSource source, java.io.File targetPath, SVNURL sourceRootUrl, java.util.Map<java.io.File,SvnNgMergeDriver.MergePath> childrenWithMergeInfo, SVNDepth depth, boolean squelchMergeinfoNotifications, ISvnDiffCallback2 processor)
protected SvnSingleRangeConflictReport
SvnNgMergeDriver. doMergeInfoUnawareDirectoryMerge(SvnNgMergeDriver.MergeSource source, java.io.File targetPath, java.util.Map<java.io.File,SvnNgMergeDriver.MergePath> childrenWithMergeInfo, SVNDepth depth)
-