new SVNMergeRange(Math.min(revision1, revision2), Math.max(revision1, revision2), true)); SVNMergeRangeList subtreeGapRanges = requestedRanges.remove(rootPath.remainingRanges, false); if (subtreeGapRanges.isEmpty()) { return; inoperativeRanges = inoperativeRanges.remove(logHandler.operativeRanges, false); logHandler.mergedRanges = logHandler.mergedRanges.merge(inoperativeRanges); MergePath child = iterator.next(); if (child.remainingRanges != null && !child.remainingRanges.isEmpty()) { child.remainingRanges = child.remainingRanges.remove(logHandler.mergedRanges, false);
new SVNMergeRange(Math.min(revision1, revision2), Math.max(revision1, revision2), true)); SVNMergeRangeList subtreeGapRanges = requestedRanges.remove(rootPath.myRemainingRanges, false); if (subtreeGapRanges.isEmpty()) { return; inoperativeRanges = inoperativeRanges.remove(logHandler.operativeRanges, false); logHandler.mergedRanges = logHandler.mergedRanges.merge(inoperativeRanges); MergePath child = (MergePath) iterator.next(); if (child.myRemainingRanges != null && !child.myRemainingRanges.isEmpty()) { child.myRemainingRanges = child.myRemainingRanges.remove(logHandler.mergedRanges, false);
rangelist = rangelist.remove(ranges, false); } else { rangelist = rangelist.merge(ranges);
explicitRangeList = requestedMergeRangeList.remove(targetRangeList, false); } else { explicitRangeList = requestedMergeRangeList.dup(); targetImplicitRangeList = (SVNMergeRangeList) child.myImplicitMergeInfo.get(mergeInfoPath); if (targetImplicitRangeList != null) { child.myRemainingRanges = explicitRangeList.remove(targetImplicitRangeList, false); } else { child.myRemainingRanges = explicitRangeList.dup();
explicitRangeList = requestedMergeRangeList.remove(targetRangeList, false); } else { explicitRangeList = requestedMergeRangeList.dup(); targetImplicitRangeList = (SVNMergeRangeList) child.implicitMergeInfo.get(mergeInfoPath); if (targetImplicitRangeList != null) { child.remainingRanges = explicitRangeList.remove(targetImplicitRangeList, false); } else { child.remainingRanges = explicitRangeList.dup();
childMergeRangelist = childMergeRangelist.reverse(); childMergeRangelist = childMergeRangelist.remove(implicitSrcGap, false); if (isRollBack) { childMergeRangelist = childMergeRangelist.reverse();
deletedRanges.setInheritable(false); masterNonInheritableRangeList = masterNonInheritableRangeList.merge(deletedRanges); masterInheritableRangeList = masterInheritableRangeList.remove(deletedRanges, false); sourceMasterRangeList = sourceMasterRangeList.merge(rl); sourceMasterRangeList = sourceMasterRangeList.remove(masterNonInheritableRangeList, false); sourceMasterRangeList = sourceMasterRangeList.merge(masterNonInheritableRangeList); masterInheritableRangeList = sourceMasterRangeList.remove(masterInheritableRangeList, true);