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

Fields in org.tmatesoft.svn.core.internal.wc17 declared as SvnNgMergeDriver.MergeSource

Modifier and Type	Field	Description
private final SvnNgMergeDriver.MergeSource	SvnConflictReport.conflictedRange
private final SvnNgMergeDriver.MergeSource	SvnSingleRangeConflictReport.conflictedRange
private final SvnNgMergeDriver.MergeSource	SvnSingleRangeConflictReport.remainingSource

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

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

Modifier	Constructor	Description
	SvnConflictReport(java.io.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

Fields in org.tmatesoft.svn.core.internal.wc2.ng declared as SvnNgMergeDriver.MergeSource

Modifier and Type	Field	Description
(package private) SvnNgMergeDriver.MergeSource	SvnNgMergeDriver.mergeSource

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

Modifier and Type	Method	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	Description
private java.util.List<SvnNgMergeDriver.MergeSource>	SvnNgMergeDriver.combineRangeWithSegments(SVNMergeRange range, SVNLocationSegment[] segments, SVNURL sourceRootURL)
java.util.List<SvnNgMergeDriver.MergeSource>	SvnNgMergeDriver.normalizeMergeSources(SvnTarget source, SVNURL sourceURL, SVNURL sourceRootURL, SVNRevision pegRevision, java.util.Collection<SVNRevisionRange> rangesToMerge, SVNRepository repository)

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

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)
private void	SvnNgMergeDriver.driveMergeReportEditor(java.io.File targetAbsPath, SvnNgMergeDriver.MergeSource source, java.util.Map<java.io.File,SvnNgMergeDriver.MergePath> childrenWithMergeInfo, ISvnDiffCallback2 processor, SVNDepth depth)
private SVNConflictVersion[]	SvnNgMergeCallback2.makeConflictVersions(java.io.File victimAbsPath, SVNNodeKind nodeKind, SVNURL rootUrl, SvnNgMergeDriver.MergeSource mergeSource, java.io.File targetAbsPath)

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

Modifier and Type	Method	Description
protected SvnNgMergeDriver.MergeData	SvnNgMergeDriver.doMerge(java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNMergeRangeList>> resultCatalog, java.util.List<SvnNgMergeDriver.MergeSource> mergeSources, java.io.File targetAbsPath, SVNRepository sourceRepository, boolean sourcesRelated, boolean sameRepository, boolean ignoreMergeInfo, boolean diffIgnoreAncestry, boolean forceDelete, boolean dryRun, boolean recordOnly, java.util.Collection<java.io.File> recordOnlyPaths, boolean reintegrateMerge, boolean squelcheMergeInfoNotifications, SVNDepth depth, SVNDiffOptions diffOptions)