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) |
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) |