lastRange = combineWithLastRange(resultRanges, lastRange, range1, true, false); i++; j++; } else if (res < 0) { lastRange = combineWithLastRange(resultRanges, lastRange, range1, true, false); i++; } else { lastRange = combineWithLastRange(resultRanges, lastRange, range2, true, false); j++; lastRange = combineWithLastRange(resultRanges, lastRange, range, true, false); lastRange = combineWithLastRange(resultRanges, lastRange, range, true, false);
lastRange = combineWithLastRange(resultRanges, lastRange, range1, true, false); i++; j++; } else if (res < 0) { lastRange = combineWithLastRange(resultRanges, lastRange, range1, true, false); i++; } else { lastRange = combineWithLastRange(resultRanges, lastRange, range2, true, false); j++; lastRange = combineWithLastRange(resultRanges, lastRange, range, true, false); lastRange = combineWithLastRange(resultRanges, lastRange, range, true, false);
lastRange = combineWithLastRange(resultRanges, lastRange, range1, true, false); i++; j++; } else if (res < 0) { lastRange = combineWithLastRange(resultRanges, lastRange, range1, true, false); i++; } else { lastRange = combineWithLastRange(resultRanges, lastRange, range2, true, false); j++; lastRange = combineWithLastRange(resultRanges, lastRange, range, true, false); lastRange = combineWithLastRange(resultRanges, lastRange, range, true, false);
lastRange = combineWithLastRange(ranges, lastRange, range1, true, considerInheritance); lastRange = combineWithLastRange(ranges, lastRange, tmpRange, true, considerInheritance); SVNMergeRange tmpRange = new SVNMergeRange(Math.max(range1.getStartRevision(), range2.getStartRevision()), range2.getEndRevision(), range1.isInheritable()); lastRange = combineWithLastRange(ranges, lastRange, tmpRange, true, considerInheritance); lastRange = combineWithLastRange(ranges, lastRange, whiteBoardElement, true, considerInheritance); i++; lastRange = combineWithLastRange(ranges, lastRange, range, true, considerInheritance);
lastRange = combineWithLastRange(ranges, lastRange, range1, true, considerInheritance); lastRange = combineWithLastRange(ranges, lastRange, tmpRange, true, considerInheritance); SVNMergeRange tmpRange = new SVNMergeRange(Math.max(range1.getStartRevision(), range2.getStartRevision()), range2.getEndRevision(), range1.isInheritable()); lastRange = combineWithLastRange(ranges, lastRange, tmpRange, true, considerInheritance); lastRange = combineWithLastRange(ranges, lastRange, whiteBoardElement, true, considerInheritance); i++; lastRange = combineWithLastRange(ranges, lastRange, range, true, considerInheritance);
lastRange = combineWithLastRange(ranges, lastRange, range1, true, considerInheritance); lastRange = combineWithLastRange(ranges, lastRange, tmpRange, true, considerInheritance); SVNMergeRange tmpRange = new SVNMergeRange(Math.max(range1.getStartRevision(), range2.getStartRevision()), range2.getEndRevision(), range1.isInheritable()); lastRange = combineWithLastRange(ranges, lastRange, tmpRange, true, considerInheritance); lastRange = combineWithLastRange(ranges, lastRange, whiteBoardElement, true, considerInheritance); i++; lastRange = combineWithLastRange(ranges, lastRange, range, true, considerInheritance);