private boolean arePropsTheSame(SVNProperties props1, SVNProperties props2) { SVNProperties propsDiff = props2.compareTo(props1); SVNProperties regularPropsDiff = new SVNProperties(); categorizeProperties(propsDiff, regularPropsDiff, null, null); for (Iterator propNamesIter = regularPropsDiff.nameSet().iterator(); propNamesIter.hasNext();) { String propName = (String) propNamesIter.next(); if (!SVNProperty.MERGE_INFO.equals(propName)) { return false; } } return true; }
private boolean arePropsTheSame(SVNProperties props1, SVNProperties props2) { SVNProperties propsDiff = props2.compareTo(props1); SVNProperties regularPropsDiff = new SVNProperties(); categorizeProperties(propsDiff, regularPropsDiff, null, null); for (Iterator propNamesIter = regularPropsDiff.nameSet().iterator(); propNamesIter.hasNext();) { String propName = (String) propNamesIter.next(); if (!SVNProperty.MERGE_INFO.equals(propName)) { return false; } } return true; }
private boolean arePropsTheSame(SVNProperties props1, SVNProperties props2) { SVNProperties propsDiff = props2.compareTo(props1); SVNProperties regularPropsDiff = new SVNProperties(); categorizeProperties(propsDiff, regularPropsDiff, null, null); for (Iterator propNamesIter = regularPropsDiff.nameSet().iterator(); propNamesIter.hasNext();) { String propName = (String) propNamesIter.next(); if (!SVNProperty.MERGE_INFO.equals(propName)) { return false; } } return true; }
public SVNStatusType propertiesChanged(String path, Map originalProperties, Map diff) throws SVNException { Map regularProps = new HashMap(); categorizeProperties(diff, regularProps, null, null); if (regularProps.isEmpty()) { return SVNStatusType.UNKNOWN; } try { File file = getFile(path); SVNStatusType result = SVNPropertiesManager.mergeProperties(getWCAccess(), file, originalProperties, regularProps, false, myIsDryRun); return result; } catch (SVNException e) { if (e.getErrorMessage().getErrorCode() == SVNErrorCode.UNVERSIONED_RESOURCE || e.getErrorMessage().getErrorCode() == SVNErrorCode.ENTRY_NOT_FOUND) { return SVNStatusType.MISSING; } throw e; } }
categorizeProperties(diff, regularProps, null, null); if (regularProps.isEmpty()) { return SVNStatusType.UNKNOWN;
categorizeProperties(diff, regularProps, null, null); if (regularProps.isEmpty()) { return SVNStatusType.UNKNOWN;
categorizeProperties(diff, regularProps, null, null); if (regularProps.isEmpty()) { return SVNStatusType.UNKNOWN;