/** * Makes a copy of this merge range list. All merge ranges stored in this list will be copied * to a new array which will be covered into a new <code>SVNMergeRangeList</code> instance. * * @return copy of this merge range list */ public SVNMergeRangeList dup() { SVNMergeRange[] ranges = new SVNMergeRange[myRanges.length]; for (int i = 0; i < myRanges.length; i++) { SVNMergeRange range = myRanges[i]; ranges[i] = range.dup(); } return new SVNMergeRangeList(ranges); }
/** * Makes a copy of this merge range list. All merge ranges stored in this list will be copied * to a new array which will be covered into a new <code>SVNMergeRangeList</code> instance. * * @return copy of this merge range list */ public SVNMergeRangeList dup() { SVNMergeRange[] ranges = new SVNMergeRange[myRanges.length]; for (int i = 0; i < myRanges.length; i++) { SVNMergeRange range = myRanges[i]; ranges[i] = range.dup(); } return new SVNMergeRangeList(ranges); }
/** * Makes a copy of this merge range list. All merge ranges stored in this list will be copied * to a new array which will be covered into a new <code>SVNMergeRangeList</code> instance. * * @return copy of this merge range list */ public SVNMergeRangeList dup() { SVNMergeRange[] ranges = new SVNMergeRange[myRanges.length]; for (int i = 0; i < myRanges.length; i++) { SVNMergeRange range = myRanges[i]; ranges[i] = range.dup(); } return new SVNMergeRangeList(ranges); }
private SVNMergeRangeList filterNaturalHistoryFromMergeInfo(String srcPath, Map implicitMergeInfo, SVNMergeRange requestedRange) { SVNMergeRangeList requestedRangeList = new SVNMergeRangeList(requestedRange.dup()); SVNMergeRangeList filteredRangeList = null; if (implicitMergeInfo != null && requestedRange.getStartRevision() < requestedRange.getEndRevision()) { SVNMergeRangeList impliedRangeList = (SVNMergeRangeList) implicitMergeInfo.get(srcPath); if (impliedRangeList != null) { filteredRangeList = requestedRangeList.diff(impliedRangeList, false); } } if (filteredRangeList == null) { filteredRangeList = requestedRangeList; } return filteredRangeList; }
SVNMergeRange youngerRange = ranges[j].dup(); if (j == i && youngerRange.getStartRevision() < revision) { youngerRange.setStartRevision(revision);
private SVNMergeRangeList filterNaturalHistoryFromMergeInfo(String srcPath, Map<String, SVNMergeRangeList> implicitMergeInfo, SVNMergeRange requestedRange) { SVNMergeRangeList requestedRangeList = new SVNMergeRangeList(requestedRange.dup()); SVNMergeRangeList filteredRangeList = null; if (implicitMergeInfo != null && requestedRange.getStartRevision() < requestedRange.getEndRevision()) { SVNMergeRangeList impliedRangeList = (SVNMergeRangeList) implicitMergeInfo.get(srcPath); if (impliedRangeList != null) { filteredRangeList = requestedRangeList.diff(impliedRangeList, false); } } if (filteredRangeList == null) { filteredRangeList = requestedRangeList; } return filteredRangeList; }
private SVNMergeRangeList filterNaturalHistoryFromMergeInfo(String srcPath, Map implicitMergeInfo, SVNMergeRange requestedRange) { SVNMergeRangeList requestedRangeList = new SVNMergeRangeList(requestedRange.dup()); SVNMergeRangeList filteredRangeList = null; if (implicitMergeInfo != null && requestedRange.getStartRevision() < requestedRange.getEndRevision()) { SVNMergeRangeList impliedRangeList = (SVNMergeRangeList) implicitMergeInfo.get(srcPath); if (impliedRangeList != null) { filteredRangeList = requestedRangeList.diff(impliedRangeList, false); } } if (filteredRangeList == null) { filteredRangeList = requestedRangeList; } return filteredRangeList; }
SVNMergeRange youngerRange = ranges[j].dup(); if (j == i && youngerRange.getStartRevision() < revision) { youngerRange.setStartRevision(revision);
SVNMergeRange youngerRange = ranges[j].dup(); if (j == i && youngerRange.getStartRevision() < revision) { youngerRange.setStartRevision(revision);
private SVNMergeRangeList filterNaturalHistoryFromMergeInfo(String srcPath, Map implicitMergeInfo, SVNMergeRange requestedRange) { SVNMergeRangeList requestedRangeList = new SVNMergeRangeList(requestedRange.dup()); SVNMergeRangeList filteredRangeList = null; if (implicitMergeInfo != null && requestedRange.getStartRevision() < requestedRange.getEndRevision()) { SVNMergeRangeList impliedRangeList = (SVNMergeRangeList) implicitMergeInfo.get(srcPath); if (impliedRangeList != null) { filteredRangeList = requestedRangeList.diff(impliedRangeList, false); } } if (filteredRangeList == null) { filteredRangeList = requestedRangeList; } return filteredRangeList; }
MergePath targetMergePath = (MergePath) myChildrenWithMergeInfo.get(0); SVNMergeRange rng = range.dup(); if (entry.isFile()) { rng.setInheritable(true);
MergePath targetMergePath = (MergePath) myChildrenWithMergeInfo.get(0); SVNMergeRange rng = range.dup(); if (entry.isFile()) { rng.setInheritable(true);
SVNMergeRangeList youngerRangeList = new SVNMergeRangeList(new SVNMergeRange[0]); for (int j = i; j < ranges.length; j++) { final SVNMergeRange youngerRange = ranges[j].dup(); if (i == j && range.getStartRevision() + 1 <= revision) { youngerRange.setStartRevision(revision);
for (int j = 0; j < rl.getSize(); j++) { SVNMergeRange r2 = rl.getRanges()[j]; SVNMergeRange youngerRange = r2.dup(); if (i == j && r.getStartRevision() + 1 <= revision) { youngerRange.setStartRevision(revision);
MergePath targetMergePath = childrenWithMergeInfo.values().iterator().next(); SVNNodeKind kind = context.readKind(addedPath, false); SVNMergeRange rng = range.dup(); if (kind == SVNNodeKind.FILE) { rng.setInheritable(true);
boolean operativeMerge = isSubtreeTouchedByMerge(targetAbsPath); SVNMergeRange range = mergeRange.dup(); if (!operativeMerge) { range.setInheritable(true);
pushedMRange1 = mRange.dup(); } else { pushedMRange1 = mRange; lastRange.setInheritable(true); if (dupMRange) { pushedMRange1 = mRange.dup(); } else { pushedMRange1 = mRange; } else { if (dupMRange) { pushedMRange1 = mRange.dup(); } else { pushedMRange1 = mRange; lastRange.setEndRevision(mRange.getStartRevision()); if (dupMRange) { pushedMRange1 = mRange.dup(); } else { pushedMRange1 = mRange; lastRange.setInheritable(mRange.isInheritable()); if (dupMRange) { pushedMRange1 = mRange.dup(); } else { pushedMRange1 = mRange; pushedMRange1 = mRange.dup();