protected void elideMergeInfo(SVNWCAccess access, File path, SVNEntry entry, File wcElisionLimitPath) throws SVNException { if (wcElisionLimitPath == null || !wcElisionLimitPath.equals(path)) { Map mergeInfo = null; Map targetMergeInfo = null; boolean[] inherited = new boolean[1]; targetMergeInfo = getWCMergeInfo(path, entry, wcElisionLimitPath, SVNMergeInfoInheritance.INHERITED, false, inherited); if (inherited[0] || targetMergeInfo == null) { return; } mergeInfo = getWCMergeInfo(path, entry, wcElisionLimitPath, SVNMergeInfoInheritance.NEAREST_ANCESTOR, false, inherited); if (mergeInfo == null && wcElisionLimitPath == null) { mergeInfo = getWCOrRepositoryMergeInfo(path, entry, SVNMergeInfoInheritance.NEAREST_ANCESTOR, inherited, true, null); } if (mergeInfo == null && wcElisionLimitPath != null) { return; } SVNMergeInfoUtil.elideMergeInfo(mergeInfo, targetMergeInfo, path, null, access); } }
protected void elideMergeInfo(SVNWCAccess access, File path, SVNEntry entry, File wcElisionLimitPath) throws SVNException { if (wcElisionLimitPath == null || !wcElisionLimitPath.equals(path)) { Map mergeInfo = null; Map targetMergeInfo = null; boolean[] inherited = new boolean[1]; targetMergeInfo = getWCMergeInfo(path, entry, wcElisionLimitPath, SVNMergeInfoInheritance.INHERITED, false, inherited); if (inherited[0] || targetMergeInfo == null) { return; } mergeInfo = getWCMergeInfo(path, entry, wcElisionLimitPath, SVNMergeInfoInheritance.NEAREST_ANCESTOR, false, inherited); if (mergeInfo == null && wcElisionLimitPath == null) { mergeInfo = getWCOrRepositoryMergeInfo(path, entry, SVNMergeInfoInheritance.NEAREST_ANCESTOR, inherited, true, null); } if (mergeInfo == null && wcElisionLimitPath != null) { return; } SVNMergeInfoUtil.elideMergeInfo(mergeInfo, targetMergeInfo, path, null, access); } }