protected SvnSingleRangeConflictReport |
SvnNgMergeDriver.doDirectoryMerge(Map<File,Map<String,SVNMergeRangeList>> resultCatalog,
SvnNgMergeDriver.MergeSource source,
File targetAbsPath,
SVNURL sourceRootUrl,
ISvnDiffCallback2 processor,
SVNDepth depth,
boolean squelchMergeinfoNotifications) |
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) |