private boolean calculateMergeInheritance(SVNMergeRangeList rangeList, File localAbsPath, boolean wcPathIsMergeTarget, boolean wcPathHasMissingChild, SVNDepth depth) throws SVNException { SVNNodeKind kind = context.readKind(localAbsPath, false); boolean result = true; if (kind == SVNNodeKind.FILE) { rangeList.setInheritable(true); } else if (kind == SVNNodeKind.DIR) { if (wcPathIsMergeTarget) { if (wcPathHasMissingChild || depth == SVNDepth.FILES || depth == SVNDepth.EMPTY) { rangeList.setInheritable(false); result = false; } else { rangeList.setInheritable(true); } } else { if (wcPathHasMissingChild || depth == SVNDepth.IMMEDIATES) { rangeList.setInheritable(false); result = false; } else { rangeList.setInheritable(true); } } } return result; }
private void calculateMergeInheritance(SVNMergeRangeList rangeList, SVNEntry entry, boolean wcPathIsMergeTarget, boolean wcPathHasMissingChild, SVNDepth depth) { if (entry.isFile()) { rangeList.setInheritable(true); } else if (entry.isDirectory()) { if (wcPathIsMergeTarget) { if (wcPathHasMissingChild || depth == SVNDepth.FILES || depth == SVNDepth.EMPTY) { rangeList.setInheritable(false); } else { rangeList.setInheritable(true); } } else { if (wcPathHasMissingChild || depth == SVNDepth.IMMEDIATES) { rangeList.setInheritable(false); } else { rangeList.setInheritable(true); } } } }
private void calculateMergeInheritance(SVNMergeRangeList rangeList, SVNEntry entry, boolean wcPathIsMergeTarget, boolean wcPathHasMissingChild, SVNDepth depth) { if (entry.isFile()) { rangeList.setInheritable(true); } else if (entry.isDirectory()) { if (wcPathIsMergeTarget) { if (wcPathHasMissingChild || depth == SVNDepth.FILES || depth == SVNDepth.EMPTY) { rangeList.setInheritable(false); } else { rangeList.setInheritable(true); } } else { if (wcPathHasMissingChild || depth == SVNDepth.IMMEDIATES) { rangeList.setInheritable(false); } else { rangeList.setInheritable(true); } } } }
childMergeRangelist.setInheritable(false); childMergeRangelist = childMergeRangelist.intersect(childMergeSrcRangelist, false); if (child.recordNonInheritable) { childMergeRangelist.setInheritable(false);
rl.setInheritable(false); masterNonInheritableRangeList = masterNonInheritableRangeList.merge(rl.dup()); deletedRanges.setInheritable(false); masterNonInheritableRangeList = masterNonInheritableRangeList.merge(deletedRanges); masterInheritableRangeList = masterInheritableRangeList.remove(deletedRanges, false);