adminArea/localPath and property changes (propDiff) based on serverBaseProps, merges the changes into the working copy.
@param localPath working copy path base name
@param workingProperties working properties
@param baseProperties pristine properties
@param serverBaseProps properties that come from the server
@param propDiff property changes that come from the repository
@param adminArea admin area object representing the .svn<./code> admin area of the target which properties are merged
@param log logger
@param baseMerge if false, then changes only working properties;otherwise, changes both the base and working properties
@param dryRun if true, merge is simulated only, no realchanges are done
@return result of merging
@throws SVNException
| |