Uses of Class
org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeDriver.MergeSource

Packages that use SvnNgMergeDriver.MergeSource

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

Uses of SvnNgMergeDriver.MergeSource in org.tmatesoft.svn.core.internal.wc17

Methods in org.tmatesoft.svn.core.internal.wc17 that return SvnNgMergeDriver.MergeSource

Modifier and Type	Method and Description
SvnNgMergeDriver.MergeSource	SvnConflictReport.getConflictedRange()
SvnNgMergeDriver.MergeSource	SvnSingleRangeConflictReport.getConflictedRange()
SvnNgMergeDriver.MergeSource	SvnSingleRangeConflictReport.getRemainingSource()

Constructors in org.tmatesoft.svn.core.internal.wc17 with parameters of type SvnNgMergeDriver.MergeSource

Constructor and Description
SvnConflictReport(File targetAbsPath, SvnNgMergeDriver.MergeSource conflictedRange, boolean wasLastRange)
SvnSingleRangeConflictReport(SvnNgMergeDriver.MergeSource conflictedRange, SvnNgMergeDriver.MergeSource remainingSource)

Uses of SvnNgMergeDriver.MergeSource in org.tmatesoft.svn.core.internal.wc2.ng

Methods in org.tmatesoft.svn.core.internal.wc2.ng that return SvnNgMergeDriver.MergeSource

Modifier and Type	Method and Description
SvnNgMergeDriver.MergeSource	SvnNgMergeDriver.MergeSource.subrange(long startRevision, long endRevision)

Methods in org.tmatesoft.svn.core.internal.wc2.ng that return types with arguments of type SvnNgMergeDriver.MergeSource

Modifier and Type	Method and Description
List<SvnNgMergeDriver.MergeSource>	SvnNgMergeDriver.normalizeMergeSources(SvnTarget source, SVNURL sourceURL, SVNURL sourceRootURL, SVNRevision pegRevision, Collection<SVNRevisionRange> rangesToMerge, SVNRepository repository)

Methods in org.tmatesoft.svn.core.internal.wc2.ng with parameters of type SvnNgMergeDriver.MergeSource

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

Method parameters in org.tmatesoft.svn.core.internal.wc2.ng with type arguments of type SvnNgMergeDriver.MergeSource

Modifier and Type

Method and Description

protected SvnNgMergeDriver.MergeData

SvnNgMergeDriver.doMerge(Map<File,Map<String,SVNMergeRangeList>> resultCatalog, List<SvnNgMergeDriver.MergeSource> mergeSources, File targetAbsPath, SVNRepository sourceRepository, boolean sourcesRelated, boolean sameRepository, boolean ignoreMergeInfo, boolean diffIgnoreAncestry, boolean forceDelete, boolean dryRun, boolean recordOnly, Collection<File> recordOnlyPaths, boolean reintegrateMerge, boolean squelcheMergeInfoNotifications, SVNDepth depth, SVNDiffOptions diffOptions)