private void extendWCMergeInfo(File path, SVNEntry entry, Map mergeInfo, SVNWCAccess access) throws SVNException { Map wcMergeInfo = SVNPropertiesManager.parseMergeInfo(path, entry, false); if (wcMergeInfo != null && mergeInfo != null) { wcMergeInfo = SVNMergeInfoUtil.mergeMergeInfos(wcMergeInfo, mergeInfo); } else if (wcMergeInfo == null) { wcMergeInfo = mergeInfo; } SVNPropertiesManager.recordWCMergeInfo(path, wcMergeInfo, access); }
private void extendWCMergeInfo(File path, SVNEntry entry, Map mergeInfo, SVNWCAccess access) throws SVNException { Map wcMergeInfo = SVNPropertiesManager.parseMergeInfo(path, entry, false); if (wcMergeInfo != null && mergeInfo != null) { wcMergeInfo = SVNMergeInfoUtil.mergeMergeInfos(wcMergeInfo, mergeInfo); } else if (wcMergeInfo == null) { wcMergeInfo = mergeInfo; } SVNPropertiesManager.recordWCMergeInfo(path, wcMergeInfo, access); }
private void extendWCMergeInfo(File path, SVNEntry entry, Map mergeInfo, SVNWCAccess access) throws SVNException { Map wcMergeInfo = SVNPropertiesManager.parseMergeInfo(path, entry, false); if (wcMergeInfo != null && mergeInfo != null) { wcMergeInfo = SVNMergeInfoUtil.mergeMergeInfos(wcMergeInfo, mergeInfo); } else if (wcMergeInfo == null) { wcMergeInfo = mergeInfo; } SVNPropertiesManager.recordWCMergeInfo(path, wcMergeInfo, access); }
private void recordMergeInfoOnMergedChildren(SVNDepth depth) throws SVNException { if (depth != SVNDepth.INFINITY && myMergedPaths != null) { boolean[] isIndirectChildMergeInfo = { false }; Map childTargetMergeInfo = null; for (Iterator paths = myMergedPaths.iterator(); paths.hasNext();) { File mergedPath = (File) paths.next(); SVNEntry childEntry = myWCAccess.getVersionedEntry(mergedPath, false); if ((childEntry.isDirectory() && myTarget.equals(mergedPath) && depth == SVNDepth.IMMEDIATES) || (childEntry.isFile() && depth == SVNDepth.FILES)) { childTargetMergeInfo = getWCOrRepositoryMergeInfo(mergedPath, childEntry, SVNMergeInfoInheritance.INHERITED, isIndirectChildMergeInfo, false, myRepository1); if (isIndirectChildMergeInfo[0]) { SVNPropertiesManager.recordWCMergeInfo(mergedPath, childTargetMergeInfo, myWCAccess); } } } } }
SVNPropertiesManager.recordWCMergeInfo(pathWithNewMergeInfo, pathExplicitMergeInfo, myWCAccess);
SVNPropertiesManager.recordWCMergeInfo(pathWithNewMergeInfo, pathExplicitMergeInfo, myWCAccess);
SVNPropertiesManager.recordWCMergeInfo(pathWithNewMergeInfo, pathExplicitMergeInfo, myWCAccess);
mergeMergeInfo = SVNMergeInfoUtil.mergeMergeInfos(mergeMergeInfo, addedPathMergeInfo); SVNPropertiesManager.recordWCMergeInfo(addedPath, mergeMergeInfo, myWCAccess);
mergeMergeInfo = SVNMergeInfoUtil.mergeMergeInfos(mergeMergeInfo, addedPathMergeInfo); SVNPropertiesManager.recordWCMergeInfo(addedPath, mergeMergeInfo, myWCAccess);
SVNPropertiesManager.recordWCMergeInfo(path, mergeInfo, myWCAccess); } catch (SVNException svne) { if (svne.getErrorMessage().getErrorCode() != SVNErrorCode.ENTRY_NOT_FOUND) {
File file = new File(path); try { SVNPropertiesManager.recordWCMergeInfo(file, mergeinfo, myWCAccess); } catch (SVNException e) { if (e.getErrorMessage().getErrorCode() == SVNErrorCode.ENTRY_NOT_FOUND) {
} else { try { SVNPropertiesManager.recordWCMergeInfo(path, mergeInfo, myWCAccess); } catch (SVNException svne) { if (svne.getErrorMessage().getErrorCode() != SVNErrorCode.ENTRY_NOT_FOUND) {
SVNPropertiesManager.recordWCMergeInfo(path, mergeInfo, myWCAccess); } catch (SVNException svne) { if (svne.getErrorMessage().getErrorCode() != SVNErrorCode.ENTRY_NOT_FOUND) {
SVNPropertiesManager.recordWCMergeInfo(child.myPath, child.myPreMergeMergeInfo, myWCAccess);
SVNPropertiesManager.recordWCMergeInfo(childPath, mergeInfo, myWCAccess);
SVNPropertiesManager.recordWCMergeInfo(child.myPath, child.myPreMergeMergeInfo, myWCAccess);
SVNPropertiesManager.recordWCMergeInfo(childPath, mergeInfo, myWCAccess);
SVNPropertiesManager.recordWCMergeInfo(childPath, mergeInfo, myWCAccess);
if (!filteredRangeList.isEmpty() && (mySkippedPaths == null || mySkippedPaths.isEmpty())) { if (indirect[0]) { SVNPropertiesManager.recordWCMergeInfo(targetWCPath, targetMergeInfo, myWCAccess);
if (!filteredRangeList.isEmpty() && (mySkippedPaths == null || mySkippedPaths.isEmpty())) { if (indirect[0]) { SVNPropertiesManager.recordWCMergeInfo(targetWCPath, targetMergeInfo, myWCAccess);