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(Map<File,Map<String,SVNMergeRangeList>> resultCatalog, SvnNgMergeDriver.MergeSource source, File targetAbsPath, SVNURL sourceRootUrl, ISvnDiffCallback2 processor, SVNDepth depth, boolean squelchMergeinfoNotifications)
private SvnSingleRangeConflictReport	SvnNgMergeDriver.doFileMerge(File targetAbsPath, Map<File,Map<String,SVNMergeRangeList>> resultCatalog, SvnNgMergeDriver.MergeSource source, ISvnDiffCallback2 mergeProcessor, boolean sourcesRelated, boolean squelcheMergeInfoNotifications)
protected SvnSingleRangeConflictReport	SvnNgMergeDriver.doMergeInfoAwareDirectoryMerge(Map<File,Map<String,SVNMergeRangeList>> resultCatalog, SvnNgMergeDriver.MergeSource source, File targetPath, SVNURL sourceRootUrl, Map<File,SvnNgMergeDriver.MergePath> childrenWithMergeInfo, SVNDepth depth, boolean squelchMergeinfoNotifications, ISvnDiffCallback2 processor)
protected SvnSingleRangeConflictReport	SvnNgMergeDriver.doMergeInfoUnawareDirectoryMerge(SvnNgMergeDriver.MergeSource source, File targetPath, Map<File,SvnNgMergeDriver.MergePath> childrenWithMergeInfo, SVNDepth depth)