private Map renumberMergeInfoRevisions(SVNPropertyValue mergeInfoProp) throws SVNException { String mergeInfoString = SVNPropertyValue.getPropertyAsString(mergeInfoProp); Map mergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(mergeInfoString), null); for (Iterator mergeInfoIter = mergeInfo.keySet().iterator(); mergeInfoIter.hasNext();) { String mergeSource = (String) mergeInfoIter.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) mergeInfo.get(mergeSource); SVNMergeRange[] ranges = rangeList.getRanges(); for (int i = 0; i < ranges.length; i++) { SVNMergeRange range = ranges[i]; Long revFromMap = (Long) myRevisionsMap.get(new Long(range.getStartRevision())); if (revFromMap != null && SVNRevision.isValidRevisionNumber(revFromMap.longValue())) { range.setStartRevision(revFromMap.longValue()); } revFromMap = (Long) myRevisionsMap.get(new Long(range.getEndRevision())); if (revFromMap != null && SVNRevision.isValidRevisionNumber(revFromMap.longValue())) { range.setEndRevision(revFromMap.longValue()); } } Arrays.sort(ranges); } return mergeInfo; }
private Map renumberMergeInfoRevisions(SVNPropertyValue mergeInfoProp) throws SVNException { String mergeInfoString = SVNPropertyValue.getPropertyAsString(mergeInfoProp); Map mergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(mergeInfoString), null); for (Iterator mergeInfoIter = mergeInfo.keySet().iterator(); mergeInfoIter.hasNext();) { String mergeSource = (String) mergeInfoIter.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) mergeInfo.get(mergeSource); SVNMergeRange[] ranges = rangeList.getRanges(); for (int i = 0; i < ranges.length; i++) { SVNMergeRange range = ranges[i]; Long revFromMap = (Long) myRevisionsMap.get(new Long(range.getStartRevision())); if (revFromMap != null && SVNRevision.isValidRevisionNumber(revFromMap.longValue())) { range.setStartRevision(revFromMap.longValue()); } revFromMap = (Long) myRevisionsMap.get(new Long(range.getEndRevision())); if (revFromMap != null && SVNRevision.isValidRevisionNumber(revFromMap.longValue())) { range.setEndRevision(revFromMap.longValue()); } } Arrays.sort(ranges); } return mergeInfo; }
private Map renumberMergeInfoRevisions(SVNPropertyValue mergeInfoProp) throws SVNException { String mergeInfoString = SVNPropertyValue.getPropertyAsString(mergeInfoProp); Map mergeInfo = SVNMergeInfoUtil.parseMergeInfo(new StringBuffer(mergeInfoString), null); for (Iterator mergeInfoIter = mergeInfo.keySet().iterator(); mergeInfoIter.hasNext();) { String mergeSource = (String) mergeInfoIter.next(); SVNMergeRangeList rangeList = (SVNMergeRangeList) mergeInfo.get(mergeSource); SVNMergeRange[] ranges = rangeList.getRanges(); for (int i = 0; i < ranges.length; i++) { SVNMergeRange range = ranges[i]; Long revFromMap = (Long) myRevisionsMap.get(new Long(range.getStartRevision())); if (revFromMap != null && SVNRevision.isValidRevisionNumber(revFromMap.longValue())) { range.setStartRevision(revFromMap.longValue()); } revFromMap = (Long) myRevisionsMap.get(new Long(range.getEndRevision())); if (revFromMap != null && SVNRevision.isValidRevisionNumber(revFromMap.longValue())) { range.setEndRevision(revFromMap.longValue()); } } Arrays.sort(ranges); } return mergeInfo; }
SVNMergeRange youngerRange = ranges[j].dup(); if (j == i && youngerRange.getStartRevision() < revision) { youngerRange.setStartRevision(revision); range.setEndRevision(revision);
SVNMergeRange youngerRange = ranges[j].dup(); if (j == i && youngerRange.getStartRevision() < revision) { youngerRange.setStartRevision(revision); range.setEndRevision(revision);
SVNMergeRange youngerRange = ranges[j].dup(); if (j == i && youngerRange.getStartRevision() < revision) { youngerRange.setStartRevision(revision); range.setEndRevision(revision);
range.setStartRevision(revItemStart.myRevision); range.setEndRevision(revItemEnd.myRevision);
range.setStartRevision(revItemStart.myRevision); range.setEndRevision(revItemEnd.myRevision);
range.setStartRevision(revItemStart.myRevision); range.setEndRevision(revItemEnd.myRevision);
for (int i = 0; i < rangesArray.length; i++) { SVNMergeRange range = rangesArray[i]; range.setStartRevision(range.getStartRevision() + 1); RangeListPath rp = (RangeListPath) rangeListPaths.get(i); SVNMergeRange range = rp.myRangeList.getRanges()[0]; range.setStartRevision(tail + 1); if (range.getStartRevision() > range.getEndRevision()) { if (rp.myRangeList.getSize() == 1) {
final SVNMergeRange youngerRange = ranges[j].dup(); if (i == j && range.getStartRevision() + 1 <= revision) { youngerRange.setStartRevision(revision); range.setEndRevision(revision);
SVNMergeRange youngerRange = r2.dup(); if (i == j && r.getStartRevision() + 1 <= revision) { youngerRange.setStartRevision(revision); r.setEndRevision(revision);
boolean reverseMerge = r1.getStartRevision() > r2.getEndRevision(); if (reverseMerge) { range1.setStartRevision(r1.getEndRevision()); range1.setEndRevision(r1.getStartRevision()); range2.setStartRevision(r2.getEndRevision()); range2.setEndRevision(r2.getStartRevision()); } else { range1.setStartRevision(r1.getStartRevision()); range1.setEndRevision(r1.getEndRevision()); range2.setStartRevision(r2.getStartRevision()); range2.setEndRevision(r2.getEndRevision());
range.setStartRevision(trimRevision);
private void removeSourceGap(SVNMergeRange range, SVNMergeRangeList implicitSrcGap) { if (implicitSrcGap != null) { SVNMergeRange gapRange = implicitSrcGap.getRanges()[0]; if (range.getStartRevision() < range.getEndRevision()) { if (gapRange.getStartRevision() == range.getStartRevision()) { range.setStartRevision(gapRange.getEndRevision()); } } else { if (gapRange.getStartRevision() == range.getEndRevision()) { range.setEndRevision(gapRange.getEndRevision()); } } } }
private void removeSourceGap(SVNMergeRange range, SVNMergeRangeList implicitSrcGap) { if (implicitSrcGap != null) { SVNMergeRange gapRange = implicitSrcGap.getRanges()[0]; if (range.getStartRevision() < range.getEndRevision()) { if (gapRange.getStartRevision() == range.getStartRevision()) { range.setStartRevision(gapRange.getEndRevision()); } } else { if (gapRange.getStartRevision() == range.getEndRevision()) { range.setEndRevision(gapRange.getEndRevision()); } } } }
long[] nRangeRevisions = new long[2]; SvnNgMergeDriver.MergePath child = SvnNgMergeDriver.findNearestAncestorWithIntersectingRanges(nRangeRevisions, mergeDriver.notifyBegin.nodesWithMergeInfo, !deleteAction, localAbsPath); nRange.setStartRevision(nRangeRevisions[0]); nRange.setEndRevision(nRangeRevisions[1]); if (child == null && deleteAction) {
lastRange = combineWithLastRange(ranges, lastRange, tmpRange, true, considerInheritance); whiteBoardElement.setStartRevision(range2.getEndRevision()); whiteBoardElement.setEndRevision(range1.getEndRevision()); } else {
lastRange = combineWithLastRange(ranges, lastRange, tmpRange, true, considerInheritance); whiteBoardElement.setStartRevision(range2.getEndRevision()); whiteBoardElement.setEndRevision(range1.getEndRevision()); } else {
lastRange = combineWithLastRange(ranges, lastRange, tmpRange, true, considerInheritance); whiteBoardElement.setStartRevision(range2.getEndRevision()); whiteBoardElement.setEndRevision(range1.getEndRevision()); } else {