Uses of Class
org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeDriver.MergePath
Packages that use SvnNgMergeDriver.MergePath
-
Uses of SvnNgMergeDriver.MergePath in org.tmatesoft.svn.core.internal.wc2.ng
Fields in org.tmatesoft.svn.core.internal.wc2.ng with type parameters of type SvnNgMergeDriver.MergePathModifier and TypeFieldDescriptionprivate java.util.Map<java.io.File,
SvnNgMergeDriver.MergePath> SvnNgMergeDriver.NoopLogHandler.childrenWithMergeInfo
java.util.Map<java.io.File,
SvnNgMergeDriver.MergePath> SvnNgMergeDriver.NotifyBeginState.nodesWithMergeInfo
Methods in org.tmatesoft.svn.core.internal.wc2.ng that return SvnNgMergeDriver.MergePathModifier and TypeMethodDescriptionprotected static SvnNgMergeDriver.MergePath
SvnNgMergeDriver.findNearestAncestor
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, boolean pathIsAncestor, java.io.File localAbsPath) static SvnNgMergeDriver.MergePath
SvnNgMergeDriver.findNearestAncestorWithIntersectingRanges
(long[] revisions, java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, boolean pathIsOwnAncestor, java.io.File localAbsPath) private SvnNgMergeDriver.MergePath
SvnNgMergeDriver.getChildWithMergeinfo
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, java.io.File path) Methods in org.tmatesoft.svn.core.internal.wc2.ng that return types with arguments of type SvnNgMergeDriver.MergePathModifier and TypeMethodDescriptionprivate java.util.Map<java.io.File,
SvnNgMergeDriver.MergePath> SvnNgMergeDriver.getMergeInfoPaths
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, java.io.File targetAbsPath, SVNDepth depth, boolean dryRun, boolean sameRepos) Methods in org.tmatesoft.svn.core.internal.wc2.ng with parameters of type SvnNgMergeDriver.MergePathModifier and TypeMethodDescriptionprivate void
SvnNgMergeDriver.adjustDeletedSubTreeRanges
(SvnNgMergeDriver.MergePath child, SvnNgMergeDriver.MergePath parent, long revision1, long revision2, SVNURL primaryURL, SVNRepository repository) void
SvnNgMergeDriver.calculateRemainingRanges
(SvnNgMergeDriver.MergePath parent, SvnNgMergeDriver.MergePath child, SVNURL sourceRootURL, SVNURL url1, long revision1, SVNURL url2, long revision2, java.util.Map targetMergeInfo, SVNMergeRangeList implicitSrcGap, boolean isSubtree, boolean childInheritsImplicit, SVNRepository repository) private void
SvnNgMergeDriver.ensureImplicitMergeinfo
(SvnNgMergeDriver.MergePath parent, SvnNgMergeDriver.MergePath child, boolean childInheritsParent, long revision1, long revision2, SVNRepository repository) private void
SvnNgMergeDriver.filterMergedRevisions
(SvnNgMergeDriver.MergePath parent, SvnNgMergeDriver.MergePath child, SVNRepository repository, java.lang.String mergeInfoPath, java.util.Map targetMergeInfo, long rev1, long rev2, boolean childInheritsImplicit) private void
SvnNgMergeDriver.inheritImplicitMergeinfoFromParent
(SvnNgMergeDriver.MergePath parent, SvnNgMergeDriver.MergePath child, long revision1, long revision2, SVNRepository repository) private void
SvnNgMergeDriver.insertParentAndSiblingsOfAbsentDelSubtree
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, SvnNgMergeDriver.MergePath child, SVNDepth depth) Method parameters in org.tmatesoft.svn.core.internal.wc2.ng with type arguments of type SvnNgMergeDriver.MergePathModifier and TypeMethodDescriptionprotected 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) SvnNgMergeDriver.driveMergeReportEditor
(java.io.File targetWCPath, SVNURL url1, long revision1, SVNURL url2, long revision2, java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, SVNDepth depth, ISvnDiffCallback2 mergeCallback) protected static SvnNgMergeDriver.MergePath
SvnNgMergeDriver.findNearestAncestor
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, boolean pathIsAncestor, java.io.File localAbsPath) static SvnNgMergeDriver.MergePath
SvnNgMergeDriver.findNearestAncestorWithIntersectingRanges
(long[] revisions, java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, boolean pathIsOwnAncestor, java.io.File localAbsPath) private void
SvnNgMergeDriver.fixDeletedSubtreeRanges
(SVNURL url1, long revision1, SVNURL url2, long revision2, SVNRepository repository, java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo) private void
SvnNgMergeDriver.flagSubTreesNeedingMergeInfo
(boolean operativeMerge, SVNMergeRange mergeRange, java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, java.io.File mergeInfoPath, SVNDepth depth) private SvnNgMergeDriver.MergePath
SvnNgMergeDriver.getChildWithMergeinfo
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, java.io.File path) private java.util.Map<java.io.File,
java.lang.String> SvnNgMergeDriver.getInoperativeImmediateChildrent
(java.lang.String mergeSourceReposAbsPath, long oldestRev, long youngestRev, java.io.File targetAbsPath, SVNRepository repos, java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo) private java.util.Map<java.io.File,
SvnNgMergeDriver.MergePath> SvnNgMergeDriver.getMergeInfoPaths
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, java.io.File targetAbsPath, SVNDepth depth, boolean dryRun, boolean sameRepos) private long
SvnNgMergeDriver.getMostInclusiveEndRevision
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, boolean isRollBack) private long
SvnNgMergeDriver.getMostInclusiveStartRevision
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, boolean isRollBack) private void
SvnNgMergeDriver.insertParentAndSiblingsOfAbsentDelSubtree
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, SvnNgMergeDriver.MergePath child, SVNDepth depth) private void
SvnNgMergeDriver.populateRemainingRanges
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, SVNURL sourceRootURL, SVNURL url1, long revision1, SVNURL url2, long revision2, boolean honorMergeInfo, SVNRepository repository, java.lang.String parentMergeSrcCanonPath) private void
SvnNgMergeDriver.processChildrenWithNewMergeInfo
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo) private void
SvnNgMergeDriver.recordMergeInfoForAddedSubtrees
(SVNMergeRange range, java.lang.String mergeInfoPath, SVNDepth depth, boolean squelchMergeinfoNotifications, java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo) private void
SvnNgMergeDriver.removeAbsentChildren
(java.io.File targetWCPath, java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo) private void
SvnNgMergeDriver.removeChildrenWithDeletedMergeInfo
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo) private void
SvnNgMergeDriver.removeFirstRangeFromRemainingRanges
(long endRevision, java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo) private void
SvnNgMergeDriver.removeNoOpSubtreeRanges
(SVNURL url1, long revision1, SVNURL url2, long revision2, java.io.File targetAbsPath, SVNRepository repository, java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo) private void
SvnNgMergeDriver.sliceRemainingRanges
(java.util.Map<java.io.File, SvnNgMergeDriver.MergePath> childrenWithMergeInfo, boolean isRollBack, long endRevision)