SVNMergeRangeList rangeList1 = (SVNMergeRangeList) originalSrcsToRangeLists.get(path1); SVNMergeRangeList rangeList2 = (SVNMergeRangeList) changedSrcsToRangeLists.get(path2); rangeList1 = rangeList1.merge(rangeList2); originalSrcsToRangeLists.put(path1, rangeList1); i++;
SVNMergeRangeList rangeList1 = (SVNMergeRangeList) originalSrcsToRangeLists.get(path1); SVNMergeRangeList rangeList2 = (SVNMergeRangeList) changedSrcsToRangeLists.get(path2); rangeList1 = rangeList1.merge(rangeList2); originalSrcsToRangeLists.put(path1, rangeList1); i++;
SVNMergeRangeList rangeList1 = (SVNMergeRangeList) originalSrcsToRangeLists.get(path1); SVNMergeRangeList rangeList2 = (SVNMergeRangeList) changedSrcsToRangeLists.get(path2); rangeList1 = rangeList1.merge(rangeList2); originalSrcsToRangeLists.put(path1, rangeList1); i++;
Map<String, SVNMergeRangeList> mi = unmergedToSourceCatalog.get(cpath); for (SVNMergeRangeList mrl : mi.values()) { potentiallyUnmergedRanges = potentiallyUnmergedRanges.merge(mrl);
String path = (String) paths.next(); rangelist = (SVNMergeRangeList) implicitSrcMergeInfo.get(path); implicitMergeRangeList = implicitMergeRangeList != null ? implicitMergeRangeList.merge(rangelist) : rangelist;
String path = (String) paths.next(); rangelist = (SVNMergeRangeList) implicitSrcMergeInfo.get(path); implicitMergeRangeList = implicitMergeRangeList != null ? implicitMergeRangeList.merge(rangelist) : rangelist;
String path = (String) paths.next(); rangelist = (SVNMergeRangeList) implicitSrcMergeInfo.get(path); implicitMergeRangeList = implicitMergeRangeList != null ? implicitMergeRangeList.merge(rangelist) : rangelist;
logTarget = mergeSrc; rangeList = rangeList.merge(list);
rangeList = rangeList.diff(ranges, false); } else { rangeList = rangeList.merge(ranges);
logTarget = mergeSrc; rangeList = rangeList.merge(list);
logTarget = mergeSrc; rangeList = rangeList.merge(list);
rangelist = rangelist.remove(ranges, false); } else { rangelist = rangelist.merge(ranges);
logTarget = mergeSrc; rangeList = rangeList.merge(availableRangeList);
logTarget = mergeSrc; rangeList = rangeList.merge(availableRangeList);
logTarget = mergeSrc; rangeList = rangeList.merge(availableRangeList);
child.myRemainingRanges = child.myRemainingRanges.merge(deletedRangeList); SVNMergeRangeList nonExistentRangeList = new SVNMergeRangeList(new SVNMergeRange(olderRev, segment.getStartRevision(), true)); nonExistentRangeList = parent.myRemainingRanges.intersect(nonExistentRangeList, false); child.myRemainingRanges = child.myRemainingRanges.merge(nonExistentRangeList);
implicitRangeList = new SVNMergeRangeList(new SVNMergeRange[0]); implicitRangeList = implicitRangeList.merge(explicitRangeList); implicitRangeList = implicitRangeList.reverse(); child.myRemainingRanges = implicitRangeList.dup();
child.myRemainingRanges = child.myRemainingRanges.merge(deletedRangeList); SVNMergeRangeList nonExistentRangeList = new SVNMergeRangeList(new SVNMergeRange(olderRev, segment.getStartRevision(), true)); nonExistentRangeList = parent.myRemainingRanges.intersect(nonExistentRangeList, false); child.myRemainingRanges = child.myRemainingRanges.merge(nonExistentRangeList);