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; }
if (j == i && youngerRange.getStartRevision() < revision) { youngerRange.setStartRevision(revision); range.setEndRevision(revision);
if (j == i && youngerRange.getStartRevision() < revision) { youngerRange.setStartRevision(revision); range.setEndRevision(revision);
if (j == i && youngerRange.getStartRevision() < revision) { youngerRange.setStartRevision(revision); range.setEndRevision(revision);
SVNErrorManager.error(err, SVNLogType.DEFAULT); range.setEndRevision(endRev);
range.setEndRevision(revItemEnd.myRevision);
range.setEndRevision(revItemEnd.myRevision);
range.setEndRevision(revItemEnd.myRevision);
if (i == j && range.getStartRevision() + 1 <= revision) { youngerRange.setStartRevision(revision); range.setEndRevision(revision);
lastRange.setEndRevision(Math.max(range.getEndRevision(), lastRange.getEndRevision())); continue;
public SVNMergeRangeList mergeRevision(long revision) { if (getSize() > 0 && getRanges()[getSize() - 1].getEndRevision() == revision - 1) { getRanges()[getSize() - 1].setEndRevision(revision); return this; } pushRange(revision -1 , revision, true); return this; } }
if (i == j && r.getStartRevision() + 1 <= revision) { youngerRange.setStartRevision(revision); r.setEndRevision(revision);
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());
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()); } } } }
SvnNgMergeDriver.MergePath child = SvnNgMergeDriver.findNearestAncestorWithIntersectingRanges(nRangeRevisions, mergeDriver.notifyBegin.nodesWithMergeInfo, !deleteAction, localAbsPath); nRange.setStartRevision(nRangeRevisions[0]); nRange.setEndRevision(nRangeRevisions[1]); if (child == null && deleteAction) { child = SvnNgMergeDriver.findNearestAncestor(mergeDriver.notifyBegin.nodesWithMergeInfo, true, localAbsPath);
whiteBoardElement.setEndRevision(range1.getEndRevision()); } else { i++;
whiteBoardElement.setEndRevision(range1.getEndRevision()); } else { i++;