Package | Description |
---|---|
org.tmatesoft.svn.core.internal.wc2.ng |
Modifier and Type | Field and Description |
---|---|
Map<File,SvnNgMergeDriver.MergePath> |
SvnNgMergeDriver.NotifyBeginState.nodesWithMergeInfo |
Modifier and Type | Method and Description |
---|---|
protected static SvnNgMergeDriver.MergePath |
SvnNgMergeDriver.findNearestAncestor(Map<File,SvnNgMergeDriver.MergePath> childrenWithMergeInfo,
boolean pathIsAncestor,
File localAbsPath) |
static SvnNgMergeDriver.MergePath |
SvnNgMergeDriver.findNearestAncestorWithIntersectingRanges(long[] revisions,
Map<File,SvnNgMergeDriver.MergePath> childrenWithMergeInfo,
boolean pathIsOwnAncestor,
File localAbsPath) |
Modifier and Type | Method and Description |
---|---|
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) |
Modifier and Type | Method and Description |
---|---|
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) |
SvnNgRemoteMergeEditor |
SvnNgMergeDriver.driveMergeReportEditor(File targetWCPath,
SVNURL url1,
long revision1,
SVNURL url2,
long revision2,
Map<File,SvnNgMergeDriver.MergePath> childrenWithMergeInfo,
SVNDepth depth,
ISvnDiffCallback2 mergeCallback) |
protected static SvnNgMergeDriver.MergePath |
SvnNgMergeDriver.findNearestAncestor(Map<File,SvnNgMergeDriver.MergePath> childrenWithMergeInfo,
boolean pathIsAncestor,
File localAbsPath) |
static SvnNgMergeDriver.MergePath |
SvnNgMergeDriver.findNearestAncestorWithIntersectingRanges(long[] revisions,
Map<File,SvnNgMergeDriver.MergePath> childrenWithMergeInfo,
boolean pathIsOwnAncestor,
File localAbsPath) |
protected void |
SvnNgMergeDriver.recordMergeInfoForDirectoryMerge(Map<File,Map<String,SVNMergeRangeList>> resultCatalog,
SVNMergeRange mergeRange,
String mergeInfoPath,
SVNDepth depth,
boolean squelchMergeinfoNotifications,
Map<File,SvnNgMergeDriver.MergePath> childrenWithMergeInfo) |
Copyright © 2023. All rights reserved.