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); }
inherit = SVNMergeInfoInheritance.INHERITED; } else { wcMergeInfo = SVNPropertiesManager.parseMergeInfo(path, entry, base);
inherit = SVNMergeInfoInheritance.INHERITED; } else { wcMergeInfo = SVNPropertiesManager.parseMergeInfo(path, entry, base);
inherit = SVNMergeInfoInheritance.INHERITED; } else { wcMergeInfo = SVNPropertiesManager.parseMergeInfo(path, entry, base);
pathEntry.getAdminArea().getWCAccess().retrieve(path); mergeInfo = SVNPropertiesManager.parseMergeInfo(path, entry, false); } catch (SVNException svne) { if (svne.getErrorMessage().getErrorCode() == SVNErrorCode.WC_NOT_LOCKED) {
pathEntry.getAdminArea().getWCAccess().retrieve(path); mergeInfo = SVNPropertiesManager.parseMergeInfo(path, entry, false); } catch (SVNException svne) { if (svne.getErrorMessage().getErrorCode() == SVNErrorCode.WC_NOT_LOCKED) {
pathEntry.getAdminArea().getWCAccess().retrieve(path); mergeInfo = SVNPropertiesManager.parseMergeInfo(path, entry, false); } catch (SVNException svne) { if (svne.getErrorMessage().getErrorCode() == SVNErrorCode.WC_NOT_LOCKED) {
source.mySourceRevisionNumber, repos, false); Map wcMergeInfo = SVNPropertiesManager.parseMergeInfo(srcFile, entry, false); if (wcMergeInfo != null && mergeInfo != null) { mergeInfo = SVNMergeInfoUtil.mergeMergeInfos(mergeInfo, wcMergeInfo);
source.mySourceRevisionNumber, repos, false); Map wcMergeInfo = SVNPropertiesManager.parseMergeInfo(srcFile, entry, false); if (wcMergeInfo != null && mergeInfo != null) { mergeInfo = SVNMergeInfoUtil.mergeMergeInfos(mergeInfo, wcMergeInfo);
source.mySourceRevisionNumber, repos, false); Map wcMergeInfo = SVNPropertiesManager.parseMergeInfo(srcFile, entry, false); if (wcMergeInfo != null && mergeInfo != null) { mergeInfo = SVNMergeInfoUtil.mergeMergeInfos(mergeInfo, wcMergeInfo);