Uses of Class
org.tmatesoft.svn.core.SVNMergeRangeList
Packages that use SVNMergeRangeList
Package
Description
Provides a (mostly native, using JNI and javah) implementation of
a high level Java API for
Subversion.
This package mostly contains common classes as well as interfaces used
throughout all the library.
This package provides a high-level API for managing Working Copies in a way
compatible with the native SVN command line client.
-
Uses of SVNMergeRangeList in org.tigris.subversion.javahl
Methods in org.tigris.subversion.javahl with parameters of type SVNMergeRangeListModifier and TypeMethodDescriptionstatic RevisionRange[]
JavaHLObjectFactory.createRevisionRanges
(SVNMergeRangeList rangeList) -
Uses of SVNMergeRangeList in org.tmatesoft.svn.core
Fields in org.tmatesoft.svn.core with type parameters of type SVNMergeRangeListModifier and TypeFieldDescriptionprivate Map<String,
SVNMergeRangeList> SVNMergeInfo.myMergeSrcPathsToRangeLists
Methods in org.tmatesoft.svn.core that return SVNMergeRangeListModifier and TypeMethodDescriptionSVNMergeRangeList.diff
(SVNMergeRangeList eraserRangeList, boolean considerInheritance) RemoveseraserRangeList
(the subtrahend) from this range list (the minuend), and places the resulting difference into a newSVNMergeRangeList
object.SVNMergeRangeList.dup()
Makes a copy of this merge range list.static SVNMergeRangeList
SVNMergeRangeList.fromCollection
(Collection mergeRanges) Creates a newSVNMergeRangeList
from a collection ofmerge ranges
.SVNMergeRangeList.getInheritableRangeList
(long startRev, long endRev) Returns a sublist of this range list which excludes all non-inheritable merge ranges.SVNMergeRangeList.getInheritableRangeList
(long startRev, long endRev, boolean inheritable) SVNMergeRangeList.intersect
(SVNMergeRangeList rangeList, boolean considerInheritance) Finds the intersection of this range list andrangeList
and places the result into a newSVNMergeRangeList
object.SVNMergeRangeList.merge
(SVNMergeRangeList rangeList) Merges two range lists placing the results into a newSVNMergeRangeList
object.SVNMergeRangeList.mergeRevision
(long revision) SVNMergeRangeList.remove
(SVNMergeRangeList remove, boolean considerInheritance) private SVNMergeRangeList
SVNMergeRangeList.removeOrIntersect
(SVNMergeRangeList eraserRangeList, boolean remove, boolean considerInheritance) SVNMergeRangeList.reverse()
Reverses this range list, and the start and end fields of each range in this range list, in place.Methods in org.tmatesoft.svn.core that return types with arguments of type SVNMergeRangeListModifier and TypeMethodDescriptionSVNMergeInfo.getMergeSourcesToMergeLists()
Returns a hash mapping merge sources to merge range lists.Methods in org.tmatesoft.svn.core with parameters of type SVNMergeRangeListModifier and TypeMethodDescriptionSVNMergeRangeList.diff
(SVNMergeRangeList eraserRangeList, boolean considerInheritance) RemoveseraserRangeList
(the subtrahend) from this range list (the minuend), and places the resulting difference into a newSVNMergeRangeList
object.SVNMergeRangeList.intersect
(SVNMergeRangeList rangeList, boolean considerInheritance) Finds the intersection of this range list andrangeList
and places the result into a newSVNMergeRangeList
object.SVNMergeRangeList.merge
(SVNMergeRangeList rangeList) Merges two range lists placing the results into a newSVNMergeRangeList
object.SVNMergeRangeList.remove
(SVNMergeRangeList remove, boolean considerInheritance) private SVNMergeRangeList
SVNMergeRangeList.removeOrIntersect
(SVNMergeRangeList eraserRangeList, boolean remove, boolean considerInheritance) Constructor parameters in org.tmatesoft.svn.core with type arguments of type SVNMergeRangeListModifierConstructorDescriptionSVNMergeInfo
(String path, Map<String, SVNMergeRangeList> srcsToRangeLists) Creates a newSVNMergeInfo
object. -
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.io.fs
Fields in org.tmatesoft.svn.core.internal.io.fs declared as SVNMergeRangeListModifier and TypeFieldDescription(package private) SVNMergeRangeList
FSLog.RangeListPath.myRangeList
-
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.util
Methods in org.tmatesoft.svn.core.internal.util that return SVNMergeRangeListModifier and TypeMethodDescriptionstatic SVNMergeRangeList[]
SVNMergeInfoUtil.diffMergeRangeLists
(SVNMergeRangeList fromRangeList, SVNMergeRangeList toRangeList, boolean considerInheritance) Methods in org.tmatesoft.svn.core.internal.util that return types with arguments of type SVNMergeRangeListModifier and TypeMethodDescriptionstatic Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.adjustMergeInfoSourcePaths
(Map<String, SVNMergeRangeList> mergeInfo, String walkPath, Map<String, SVNMergeRangeList> wcMergeInfo) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.appendSuffix
(Map<String, SVNMergeRangeList> mergeinfo, String suffix) static Map<String,
Map<String, SVNMergeRangeList>> SVNMergeInfoUtil.elideMergeInfoCatalog
(Map<String, Map<String, SVNMergeRangeList>> mergeInfoCatalog) static Map<String,
Map<String, SVNMergeRangeList>> SVNMergeInfoUtil.filterCatalogByRanges
(Map<String, Map<String, SVNMergeRangeList>> catalog, long youngestRev, long oldestRev) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.filterMergeInfoByRanges
(Map<String, SVNMergeRangeList> mergeInfo, long youngestRev, long oldestRev) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.getInheritableMergeInfo
(Map<String, SVNMergeRangeList> mergeInfo, String path, long startRev, long endRev) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.getInheritableMergeInfo
(Map<String, SVNMergeRangeList> mergeInfo, String path, long startRev, long endRev, boolean inheritable) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.intersectMergeInfo
(Map mergeInfo1, Map mergeInfo2, boolean considerInheritance) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.mergeMergeInfos
(Map<String, SVNMergeRangeList> originalSrcsToRangeLists, Map<String, SVNMergeRangeList> changedSrcsToRangeLists) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.parseMergeInfo
(StringBuffer mergeInfo, Map<String, SVNMergeRangeList> srcPathsToRangeLists) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.removeMergeInfo
(Map<String, SVNMergeRangeList> eraser, Map<String, SVNMergeRangeList> whiteBoard, boolean considerInheritance) Methods in org.tmatesoft.svn.core.internal.util with parameters of type SVNMergeRangeListModifier and TypeMethodDescriptionstatic SVNMergeRangeList[]
SVNMergeInfoUtil.diffMergeRangeLists
(SVNMergeRangeList fromRangeList, SVNMergeRangeList toRangeList, boolean considerInheritance) Method parameters in org.tmatesoft.svn.core.internal.util with type arguments of type SVNMergeRangeListModifier and TypeMethodDescriptionstatic Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.adjustMergeInfoSourcePaths
(Map<String, SVNMergeRangeList> mergeInfo, String walkPath, Map<String, SVNMergeRangeList> wcMergeInfo) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.appendSuffix
(Map<String, SVNMergeRangeList> mergeinfo, String suffix) static Map<String,
Map<String, SVNMergeRangeList>> SVNMergeInfoUtil.elideMergeInfoCatalog
(Map<String, Map<String, SVNMergeRangeList>> mergeInfoCatalog) static Map<String,
Map<String, SVNMergeRangeList>> SVNMergeInfoUtil.filterCatalogByRanges
(Map<String, Map<String, SVNMergeRangeList>> catalog, long youngestRev, long oldestRev) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.filterMergeInfoByRanges
(Map<String, SVNMergeRangeList> mergeInfo, long youngestRev, long oldestRev) static String
SVNMergeInfoUtil.formatMergeInfoCatalogToString2
(Map<File, Map<String, SVNMergeRangeList>> catalog, String keyPrefix, String valuePrefix) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.getInheritableMergeInfo
(Map<String, SVNMergeRangeList> mergeInfo, String path, long startRev, long endRev) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.getInheritableMergeInfo
(Map<String, SVNMergeRangeList> mergeInfo, String path, long startRev, long endRev, boolean inheritable) static long[]
SVNMergeInfoUtil.getRangeEndPoints
(Map<?, SVNMergeRangeList> mergeInfo) static boolean
SVNMergeInfoUtil.isNonInheritable
(Map<String, SVNMergeRangeList> mergeInfo) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.mergeMergeInfos
(Map<String, SVNMergeRangeList> originalSrcsToRangeLists, Map<String, SVNMergeRangeList> changedSrcsToRangeLists) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.parseMergeInfo
(StringBuffer mergeInfo, Map<String, SVNMergeRangeList> srcPathsToRangeLists) static Map<String,
SVNMergeRangeList> SVNMergeInfoUtil.removeMergeInfo
(Map<String, SVNMergeRangeList> eraser, Map<String, SVNMergeRangeList> whiteBoard, boolean considerInheritance) static boolean
SVNMergeInfoUtil.shouldElideMergeInfo
(Map<String, SVNMergeRangeList> parentMergeInfo, Map<String, SVNMergeRangeList> childMergeInfo, String pathSuffix) -
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.wc
Fields in org.tmatesoft.svn.core.internal.wc declared as SVNMergeRangeListModifier and TypeFieldDescriptionprivate SVNMergeRangeList
SVNMergeDriver.NoopLogHandler.mergedRanges
private SVNMergeRangeList
SVNMergeDriver.myImplicitSrcGap
(package private) SVNMergeRangeList
SVNMergeDriver.LogHandlerFilter.myRangeList
SVNMergeDriver.MergePath.myRemainingRanges
private SVNMergeRangeList
SVNMergeDriver.NoopLogHandler.operativeRanges
Methods in org.tmatesoft.svn.core.internal.wc that return SVNMergeRangeListModifier and TypeMethodDescriptionprivate SVNMergeRangeList
SVNMergeDriver.filterNaturalHistoryFromMergeInfo
(String srcPath, Map implicitMergeInfo, SVNMergeRange requestedRange) private SVNMergeRangeList
SVNMergeDriver.removeNoOpMergeRanges
(SVNRepository repository, SVNMergeRangeList ranges) Methods in org.tmatesoft.svn.core.internal.wc that return types with arguments of type SVNMergeRangeListModifier and TypeMethodDescriptionstatic Map<String,
SVNMergeRangeList> SVNMergeDriver.getMergeInfoFromSegments
(Collection segments) Methods in org.tmatesoft.svn.core.internal.wc with parameters of type SVNMergeRangeListModifier and TypeMethodDescriptionprivate void
SVNMergeDriver.calculateMergeInheritance
(SVNMergeRangeList rangeList, SVNEntry entry, boolean wcPathIsMergeTarget, boolean wcPathHasMissingChild, SVNDepth depth) void
SVNMergeDriver.calculateRemainingRanges
(SVNMergeDriver.MergePath parent, SVNMergeDriver.MergePath child, SVNURL sourceRootURL, SVNURL url1, long revision1, SVNURL url2, long revision2, Map targetMergeInfo, SVNMergeRangeList implicitSrcGap, boolean isSubtree, boolean childInheritsImplicit, SVNEntry entry, SVNRepository repository) protected void
SVNMergeDriver.getLogsForMergeInfoRangeList
(SVNURL reposRootURL, String[] paths, SVNMergeRangeList rangeList, boolean discoverChangedPaths, String[] revProps, ISVNLogEntryHandler handler) private SVNMergeRangeList
SVNMergeDriver.removeNoOpMergeRanges
(SVNRepository repository, SVNMergeRangeList ranges) Constructors in org.tmatesoft.svn.core.internal.wc with parameters of type SVNMergeRangeListModifierConstructorDescriptionLogHandlerFilter
(ISVNLogEntryHandler handler, SVNMergeRangeList rangeList) -
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.wc16
Methods in org.tmatesoft.svn.core.internal.wc16 that return types with arguments of type SVNMergeRangeListModifier and TypeMethodDescriptionSVNDiffClient16.doGetMergedMergeInfo
(File path, SVNRevision pegRevision) Returns mergeinfo as aMap
with merge source URLs (asSVNURL
) mapped to range lists (SVNMergeRangeList
).SVNDiffClient16.doGetMergedMergeInfo
(SVNURL url, SVNRevision pegRevision) Returns mergeinfo as aMap
with merge source URLs (asSVNURL
) mapped to range lists (SVNMergeRangeList
). -
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.wc2
Methods in org.tmatesoft.svn.core.internal.wc2 that return types with arguments of type SVNMergeRangeListModifier and TypeMethodDescriptionSvnRepositoryAccess.getHistoryAsMergeInfo
(SVNRepository repos, SvnTarget target, long youngest, long oldest) private Map<String,
SVNMergeRangeList> SvnRepositoryAccess.getHistoryAsMergeInfo
(SVNURL url, SVNRevision pegRevision, long rangeYoungest, long rangeOldest, boolean[] hasZero, SVNRepository repos) static Map<String,
SVNMergeRangeList> SvnRepositoryAccess.getMergeInfoFromSegments
(Collection<SVNLocationSegment> segments) SvnRepositoryAccess.getReposMergeInfo
(SVNRepository repository, String path, long revision, SVNMergeInfoInheritance inheritance, boolean squelchIncapable) -
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.wc2.ng
Fields in org.tmatesoft.svn.core.internal.wc2.ng declared as SVNMergeRangeListModifier and TypeFieldDescriptionprotected SVNMergeRangeList
SvnNgMergeDriver.implicitSrcGap
private SVNMergeRangeList
SvnNgMergeDriver.NoopLogHandler.mergedRanges
private SVNMergeRangeList
SvnNgMergeDriver.NoopLogHandler.operativeRanges
private SVNMergeRangeList
SvnNgLogMergeInfo.LogEntryReceiver.rangelist
protected SVNMergeRangeList
SvnNgMergeDriver.MergePath.remainingRanges
Fields in org.tmatesoft.svn.core.internal.wc2.ng with type parameters of type SVNMergeRangeListModifier and TypeFieldDescription(package private) Map<String,
Map<String, SVNMergeRangeList>> SvnNgMergeinfoUtil.SvnMergeInfoCatalogInfo.catalog
private Map<String,
Map<String, SVNMergeRangeList>> SvnNgMergeReintegrate.UnmergedMergeInfo.catalog
protected Map<String,
SVNMergeRangeList> SvnNgMergeDriver.MergePath.implicitMergeInfo
(package private) Map<String,
SVNMergeRangeList> SvnNgMergeinfoUtil.SvnMergeInfoInfo.mergeinfo
private Map<String,
SVNMergeRangeList> SvnNgMergeCallback2.SplitMergeInfo.mergeInfo
protected Map<String,
SVNMergeRangeList> SvnNgMergeDriver.MergePath.preMergeMergeInfo
private Map<String,
Map<String, SVNMergeRangeList>> SvnNgLogMergeInfo.LogEntryReceiver.targetCatalog
private Map<String,
SVNMergeRangeList> SvnNgMergeCallback2.SplitMergeInfo.youngerMergeInfo
Methods in org.tmatesoft.svn.core.internal.wc2.ng that return SVNMergeRangeListModifier and TypeMethodDescriptionprivate SVNMergeRangeList
SvnNgMergeDriver.filterNaturalHistoryFromMergeInfo
(String srcPath, Map<String, SVNMergeRangeList> implicitMergeInfo, SVNMergeRange requestedRange) private SVNMergeRangeList
SvnNgMergeDriver.removeNoOpMergeRanges
(SVNRepository repository, SVNMergeRangeList ranges) Methods in org.tmatesoft.svn.core.internal.wc2.ng that return types with arguments of type SVNMergeRangeListModifier and TypeMethodDescriptionstatic Map<String,
Map<String, SVNMergeRangeList>> SvnNgMergeinfoUtil.addPrefixToCatalog
(Map<String, Map<String, SVNMergeRangeList>> catalog, File prefix) private Map<String,
SVNMergeRangeList> SvnNgReposToWcCopy.calculateTargetMergeInfo
(SVNURL srcURL, long srcRevision, SVNRepository repository) private Map<String,
SVNMergeRangeList> SvnNgWcToReposCopy.calculateTargetMergeInfo
(File srcFile, long srcRevision, SVNRepository repository) static Map<String,
Map<String, SVNMergeRangeList>> SvnNgMergeinfoUtil.convertToCatalog
(Map<String, SVNMergeInfo> catalog) static Map<File,
Map<String, SVNMergeRangeList>> SvnNgMergeinfoUtil.convertToCatalog2
(Map<String, SVNMergeInfo> catalog) protected Map<String,
SVNMergeRangeList>[] SvnNgMergeDriver.getFullMergeInfo
(boolean getRecorded, boolean getImplicit, boolean[] inherited, SVNMergeInfoInheritance inherit, SVNRepository repos, File target, long start, long end) static Map<String,
Map<String, SVNMergeRangeList>> SvnNgMergeinfoUtil.getMergeInfo
(SVNWCContext context, SvnRepositoryAccess repoAccess, SvnTarget target, boolean includeDescendants, boolean ignoreInvalidMergeInfo, SVNURL[] root) private TreeMap<File,
Map<String, SVNMergeRangeList>> SvnNgMergeDriver.getWcExplicitMergeInfoCatalog
(File targetAbsPath, SVNDepth depth) static Map<String,
SVNMergeRangeList> SvnNgMergeinfoUtil.getWCOrReposMergeInfo
(SVNWCContext context, File wcPath, SVNRepository repository, boolean reposOnly, SVNMergeInfoInheritance inheritance) private static Map<String,
SVNMergeRangeList> SvnNgMergeinfoUtil.parseMergeInfo
(SVNWCContext context, File localAbsPath) protected Map<SVNURL,
SVNMergeRangeList> SvnNgGetMergeInfo.run
(SVNWCContext context) private Map<String,
SVNMergeRangeList>[] SvnNgMergeCallback.splitMergeInfoOnRevision
(Map<String, SVNMergeRangeList> mergeinfo, long revision) Methods in org.tmatesoft.svn.core.internal.wc2.ng with parameters of type SVNMergeRangeListModifier and TypeMethodDescriptionprivate boolean
SvnNgMergeDriver.calculateMergeInheritance
(SVNMergeRangeList rangeList, File localAbsPath, boolean wcPathIsMergeTarget, boolean wcPathHasMissingChild, SVNDepth depth) void
SvnNgMergeDriver.calculateRemainingRanges
(SvnNgMergeDriver.MergePath parent, SvnNgMergeDriver.MergePath child, SVNURL sourceRootURL, SVNURL url1, long revision1, SVNURL url2, long revision2, Map targetMergeInfo, SVNMergeRangeList implicitSrcGap, boolean isSubtree, boolean childInheritsImplicit, SVNRepository repository) private void
SvnNgLogMergeInfo.logForMergeInfoRangeList
(SVNURL sourceURL, List<String> mergeSourcePaths, boolean filteringMerged, SVNMergeRangeList rangelist, boolean oldestRevsFirst, Map<String, Map<String, SVNMergeRangeList>> targetCatalog, String absReposTargetPath, boolean discoverChangedPaths, String[] revprops, ISvnObjectReceiver<SVNLogEntry> receiver) private void
SvnNgMergeDriver.recordSkips
(String mergeInfoPath, SVNMergeRangeList childMergeRangelist, boolean isRollBack) private SVNMergeRangeList
SvnNgMergeDriver.removeNoOpMergeRanges
(SVNRepository repository, SVNMergeRangeList ranges) private void
SvnNgMergeCallback2.removeSourceGap
(SVNMergeRange range, SVNMergeRangeList implicitSrcGap) private void
SvnNgMergeDriver.removeSourceGap
(SVNMergeRange range, SVNMergeRangeList implicitSrcGap) Method parameters in org.tmatesoft.svn.core.internal.wc2.ng with type arguments of type SVNMergeRangeListModifier and TypeMethodDescriptionstatic Map<String,
Map<String, SVNMergeRangeList>> SvnNgMergeinfoUtil.addPrefixToCatalog
(Map<String, Map<String, SVNMergeRangeList>> catalog, File prefix) private SvnTarget
SvnNgMergeReintegrate.calculateLeftHandSide
(SVNWCContext context, Map<File, Map<String, SVNMergeRangeList>> mergedToSourceCatalog, Map<File, Map<String, SVNMergeRangeList>> unmergedToSourceCatalog, File targetAbsPath, File targetReposRelPath, Map<File, String> subtreesWithMergeInfo, long targetRev, File sourceReposRelPath, SVNURL sourceReposRoot, SVNURL targetReposRoot, long sourceRev, SVNRepository sourceRepository, SVNRepository targetRepository) protected SvnSingleRangeConflictReport
SvnNgMergeDriver.doDirectoryMerge
(Map<File, Map<String, SVNMergeRangeList>> resultCatalog, SvnNgMergeDriver.MergeSource source, File targetAbsPath, SVNURL sourceRootUrl, ISvnDiffCallback2 processor, SVNDepth depth, boolean squelchMergeinfoNotifications) private SvnSingleRangeConflictReport
SvnNgMergeDriver.doFileMerge
(File targetAbsPath, Map<File, Map<String, SVNMergeRangeList>> resultCatalog, SvnNgMergeDriver.MergeSource source, ISvnDiffCallback2 mergeProcessor, boolean sourcesRelated, boolean squelcheMergeInfoNotifications) 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) 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) private static void
SvnNgMergeinfoUtil.elideMergeInfo
(SVNWCContext context, Map<String, SVNMergeRangeList> parent, Map<String, SVNMergeRangeList> child, File targetAbsPath) private SVNMergeRangeList
SvnNgMergeDriver.filterNaturalHistoryFromMergeInfo
(String srcPath, Map<String, SVNMergeRangeList> implicitMergeInfo, SVNMergeRange requestedRange) SvnNgMergeReintegrate.findUnmergedMergeInfo
(long ycAncestorRev, Map<File, Map<String, SVNMergeRangeList>> sourceCatalog, Map<File, List<SVNLocationSegment>> targetSegments, File sourceReposRelPath, File targetReposRelPath, long targetRev, long sourceRev, SVNRepository sourceRepos, SVNRepository targetRepos) private void
SvnNgMergeReintegrate.findUnsyncedRanges
(File sourceReposRelPath, File targetReposRelPath, Map<File, Map<String, SVNMergeRangeList>> unmergedToSourceCatalog, Map<File, Map<String, SVNMergeRangeList>> mergedToSourceCatalog, Map<File, Map<String, SVNMergeRangeList>> finalUnmergedCatalog, SVNRepository repos) private boolean
SvnNgMergeReintegrate.isMergeinfoInCatalog
(File sourceRelpath, File[] catPath, Map<String, SVNMergeRangeList> mergeinfo, long revision, Map<File, Map<String, SVNMergeRangeList>> catalog) private void
SvnNgLogMergeInfo.logForMergeInfoRangeList
(SVNURL sourceURL, List<String> mergeSourcePaths, boolean filteringMerged, SVNMergeRangeList rangelist, boolean oldestRevsFirst, Map<String, Map<String, SVNMergeRangeList>> targetCatalog, String absReposTargetPath, boolean discoverChangedPaths, String[] revprops, ISvnObjectReceiver<SVNLogEntry> receiver) private void
SvnNgMergeDriver.recordMergeinfo
(File localAbsPath, Map<String, SVNMergeRangeList> mergeinfo, boolean notify) protected void
SvnNgMergeDriver.recordMergeInfoForDirectoryMerge
(Map<File, Map<String, SVNMergeRangeList>> resultCatalog, SVNMergeRange mergeRange, String mergeInfoPath, SVNDepth depth, boolean squelchMergeinfoNotifications, Map<File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo) private Map<String,
SVNMergeRangeList>[] SvnNgMergeCallback.splitMergeInfoOnRevision
(Map<String, SVNMergeRangeList> mergeinfo, long revision) SvnNgMergeCallback2.splitMergeInfoOnRevision
(Map<String, SVNMergeRangeList> mergeInfo, long revision) private void
SvnNgMergeDriver.updateWCMergeInfo
(Map<File, Map<String, SVNMergeRangeList>> resultCatalog, File targetAbsPath, String reposRelPath, Map<File, SVNMergeRangeList> merges, boolean isRollBack) -
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.wc2.old
Methods in org.tmatesoft.svn.core.internal.wc2.old that return types with arguments of type SVNMergeRangeListModifier and TypeMethodDescriptionprotected Map<SVNURL,
SVNMergeRangeList> SvnOldGetMergeInfo.run()
-
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.internal.wc2.patch
Fields in org.tmatesoft.svn.core.internal.wc2.patch with type parameters of type SVNMergeRangeListModifier and TypeFieldDescription(package private) Map<String,
SVNMergeRangeList> SvnPatch.mergeInfo
Method parameters in org.tmatesoft.svn.core.internal.wc2.patch with type arguments of type SVNMergeRangeListModifier and TypeMethodDescriptionvoid
SvnPatch.setMergeInfo
(Map<String, SVNMergeRangeList> mergeInfo) -
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.javahl17
Method parameters in org.tmatesoft.svn.core.javahl17 with type arguments of type SVNMergeRangeListModifier and TypeMethodDescriptionprivate Mergeinfo
SVNClientImpl.getMergeinfo
(Map<SVNURL, SVNMergeRangeList> mergeInfoMap) -
Uses of SVNMergeRangeList in org.tmatesoft.svn.core.wc
Methods in org.tmatesoft.svn.core.wc that return types with arguments of type SVNMergeRangeListModifier and TypeMethodDescriptionSVNDiffClient.doGetMergedMergeInfo
(File path, SVNRevision pegRevision) Returns mergeinfo as aMap
with merge source URLs (asSVNURL
) mapped to range lists (SVNMergeRangeList
).SVNDiffClient.doGetMergedMergeInfo
(SVNURL url, SVNRevision pegRevision) Returns mergeinfo as aMap
with merge source URLs (asSVNURL
) mapped to range lists (SVNMergeRangeList
).