Package | Description |
---|---|
org.tmatesoft.svn.core.internal.wc17 | |
org.tmatesoft.svn.core.internal.wc2.ng |
Modifier and Type | Method and Description |
---|---|
SvnNgMergeDriver.MergeSource |
SvnSingleRangeConflictReport.getConflictedRange() |
SvnNgMergeDriver.MergeSource |
SvnConflictReport.getConflictedRange() |
SvnNgMergeDriver.MergeSource |
SvnSingleRangeConflictReport.getRemainingSource() |
Constructor and Description |
---|
SvnConflictReport(java.io.File targetAbsPath,
SvnNgMergeDriver.MergeSource conflictedRange,
boolean wasLastRange) |
SvnSingleRangeConflictReport(SvnNgMergeDriver.MergeSource conflictedRange,
SvnNgMergeDriver.MergeSource remainingSource) |
Modifier and Type | Method and Description |
---|---|
SvnNgMergeDriver.MergeSource |
SvnNgMergeDriver.MergeSource.subrange(long startRevision,
long endRevision) |
Modifier and Type | Method and Description |
---|---|
java.util.List<SvnNgMergeDriver.MergeSource> |
SvnNgMergeDriver.normalizeMergeSources(SvnTarget source,
SVNURL sourceURL,
SVNURL sourceRootURL,
SVNRevision pegRevision,
java.util.Collection<SVNRevisionRange> rangesToMerge,
SVNRepository repository) |
Modifier and Type | Method and 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) |
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) |
Modifier and Type | Method and 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) |
Copyright © 2020. All rights reserved.